Testing PR: Require rgb renderable webgl1. (#3372)
Testing this pull request:
https://github.com/KhronosGroup/WebGL/pull/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>
diff --git a/sdk/tests/conformance/textures/misc/format-filterable-renderable.html b/sdk/tests/conformance/textures/misc/format-filterable-renderable.html
index df7694b..debbaca 100644
--- a/sdk/tests/conformance/textures/misc/format-filterable-renderable.html
+++ b/sdk/tests/conformance/textures/misc/format-filterable-renderable.html
@@ -98,10 +98,10 @@
// GLES 2.0.25 p63
const FORMAT_INFO_WEBGL1 = {
RGBA8 : { filter: true, render: true , unpack: ['RGBA', 'UNSIGNED_BYTE'] },
- RGB8 : { filter: true, render: undefined, unpack: ['RGB', 'UNSIGNED_BYTE'] },
- RGBA4 : { filter: true, render: undefined, unpack: ['RGBA', 'UNSIGNED_SHORT_4_4_4_4'] },
- RGB5_A1: { filter: true, render: undefined, unpack: ['RGBA', 'UNSIGNED_SHORT_5_5_5_1'] },
- RGB565 : { filter: true, render: undefined, unpack: ['RGB', 'UNSIGNED_SHORT_5_6_5'] },
+ RGB8 : { filter: true, render: true , unpack: ['RGB', 'UNSIGNED_BYTE'] },
+ RGBA4 : { filter: true, render: true , unpack: ['RGBA', 'UNSIGNED_SHORT_4_4_4_4'] },
+ RGB5_A1: { filter: true, render: true , unpack: ['RGBA', 'UNSIGNED_SHORT_5_5_5_1'] },
+ RGB565 : { filter: true, render: true , unpack: ['RGB', 'UNSIGNED_SHORT_5_6_5'] },
LA8 : { filter: true, render: false , unpack: ['LUMINANCE_ALPHA', 'UNSIGNED_BYTE'] },
L8 : { filter: true, render: false , unpack: ['LUMINANCE', 'UNSIGNED_BYTE'] },
A8 : { filter: true, render: false , unpack: ['ALPHA', 'UNSIGNED_BYTE'] },
diff --git a/specs/latest/1.0/index.html b/specs/latest/1.0/index.html
index 9c77dd3..2a1de40 100644
--- a/specs/latest/1.0/index.html
+++ b/specs/latest/1.0/index.html
@@ -3892,9 +3892,19 @@
framebuffer being framebuffer complete:
<ul>
-<li> <code>COLOR_ATTACHMENT0</code> = <code>RGBA/UNSIGNED_BYTE</code> texture
-<li> <code>COLOR_ATTACHMENT0</code> = <code>RGBA/UNSIGNED_BYTE</code> texture + <code>DEPTH_ATTACHMENT</code> = <code>DEPTH_COMPONENT16</code> renderbuffer
-<li> <code>COLOR_ATTACHMENT0</code> = <code>RGBA/UNSIGNED_BYTE</code> texture + <code>DEPTH_STENCIL_ATTACHMENT</code> = <code>DEPTH_STENCIL</code> renderbuffer
+<li> renderbuffer or color-renderable texture
+<li> renderbuffer or color-renderable texture + <code>DEPTH_ATTACHMENT</code> = <code>DEPTH_COMPONENT16</code> renderbuffer
+<li> renderbuffer or color-renderable texture + <code>DEPTH_STENCIL_ATTACHMENT</code> = <code>DEPTH_STENCIL</code> renderbuffer
+</ul>
+
+A texture is color-renderable if it has any of the following format-type pairs:
+
+<ul>
+<li> <code>RGBA</code>, <code>UNSIGNED_BYTE</code>
+<li> <code>RGB</code>, <code>UNSIGNED_BYTE</code>
+<li> <code>RGBA</code>, <code>UNSIGNED_SHORT_4_4_4_4</code>
+<li> <code>RGBA</code>, <code>UNSIGNED_SHORT_4_4_4_4</code>
+<li> <code>RGB</code>, <code>UNSIGNED_SHORT_5_6_5</code>
</ul>
<h3><a name="TEXTURE_UPLOAD_SIZE">Texture Upload Width and Height</a></h3>