Skip to content

Commit 6092673

Browse files
authored
Testing PR: Require rgb renderable webgl1. (#3372)
Testing this pull request: #3364 off the main branch of the KhronosGroup/WebGL repository. Require all RGB and RGBA textures to be renderable in webgl1. Authored-by: Kelsey Gilbert <jdashg@gmail.com>
1 parent 44a1ee1 commit 6092673

File tree

2 files changed

+17
-7
lines changed

2 files changed

+17
-7
lines changed

sdk/tests/conformance/textures/misc/format-filterable-renderable.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,10 @@
9898
// GLES 2.0.25 p63
9999
const FORMAT_INFO_WEBGL1 = {
100100
RGBA8 : { filter: true, render: true , unpack: ['RGBA', 'UNSIGNED_BYTE'] },
101-
RGB8 : { filter: true, render: undefined, unpack: ['RGB', 'UNSIGNED_BYTE'] },
102-
RGBA4 : { filter: true, render: undefined, unpack: ['RGBA', 'UNSIGNED_SHORT_4_4_4_4'] },
103-
RGB5_A1: { filter: true, render: undefined, unpack: ['RGBA', 'UNSIGNED_SHORT_5_5_5_1'] },
104-
RGB565 : { filter: true, render: undefined, unpack: ['RGB', 'UNSIGNED_SHORT_5_6_5'] },
101+
RGB8 : { filter: true, render: true , unpack: ['RGB', 'UNSIGNED_BYTE'] },
102+
RGBA4 : { filter: true, render: true , unpack: ['RGBA', 'UNSIGNED_SHORT_4_4_4_4'] },
103+
RGB5_A1: { filter: true, render: true , unpack: ['RGBA', 'UNSIGNED_SHORT_5_5_5_1'] },
104+
RGB565 : { filter: true, render: true , unpack: ['RGB', 'UNSIGNED_SHORT_5_6_5'] },
105105
LA8 : { filter: true, render: false , unpack: ['LUMINANCE_ALPHA', 'UNSIGNED_BYTE'] },
106106
L8 : { filter: true, render: false , unpack: ['LUMINANCE', 'UNSIGNED_BYTE'] },
107107
A8 : { filter: true, render: false , unpack: ['ALPHA', 'UNSIGNED_BYTE'] },

specs/latest/1.0/index.html

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3892,9 +3892,19 @@ <h3><a name="FBO_ATTACHMENTS">Framebuffer Object Attachments</a></h3>
38923892
framebuffer being framebuffer complete:
38933893

38943894
<ul>
3895-
<li> <code>COLOR_ATTACHMENT0</code> = <code>RGBA/UNSIGNED_BYTE</code> texture
3896-
<li> <code>COLOR_ATTACHMENT0</code> = <code>RGBA/UNSIGNED_BYTE</code> texture + <code>DEPTH_ATTACHMENT</code> = <code>DEPTH_COMPONENT16</code> renderbuffer
3897-
<li> <code>COLOR_ATTACHMENT0</code> = <code>RGBA/UNSIGNED_BYTE</code> texture + <code>DEPTH_STENCIL_ATTACHMENT</code> = <code>DEPTH_STENCIL</code> renderbuffer
3895+
<li> renderbuffer or color-renderable texture
3896+
<li> renderbuffer or color-renderable texture + <code>DEPTH_ATTACHMENT</code> = <code>DEPTH_COMPONENT16</code> renderbuffer
3897+
<li> renderbuffer or color-renderable texture + <code>DEPTH_STENCIL_ATTACHMENT</code> = <code>DEPTH_STENCIL</code> renderbuffer
3898+
</ul>
3899+
3900+
A texture is color-renderable if it has any of the following format-type pairs:
3901+
3902+
<ul>
3903+
<li> <code>RGBA</code>, <code>UNSIGNED_BYTE</code>
3904+
<li> <code>RGB</code>, <code>UNSIGNED_BYTE</code>
3905+
<li> <code>RGBA</code>, <code>UNSIGNED_SHORT_4_4_4_4</code>
3906+
<li> <code>RGBA</code>, <code>UNSIGNED_SHORT_4_4_4_4</code>
3907+
<li> <code>RGB</code>, <code>UNSIGNED_SHORT_5_6_5</code>
38983908
</ul>
38993909

39003910
<h3><a name="TEXTURE_UPLOAD_SIZE">Texture Upload Width and Height</a></h3>

0 commit comments

Comments
 (0)