Skip to content

Commit

Permalink
Fix invalid combinations for texture/copy on ES2 driver
Browse files Browse the repository at this point in the history
The OES_rgb8_rgba8 extension specification only specifies
RenderbufferStorageOES for additional GL_RGB8/GL_RGBA8 tokens.  ES3 spec
made these mandatory formats for texturing/copying.

Affects:

KHR-GLES2.core.internalformat.texture2d.rgb_unsigned_byte_rgb8
KHR-GLES2.core.internalformat.texture2d.rgba_unsigned_byte_rgb8
KHR-GLES2.core.internalformat.copy_tex_image.rgba8
KHR-GLES2.core.internalformat.copy_tex_image.rgb8

Components: OpenGL
VK-GL-CTS issue: 1260

Change-Id: Icbbd8882c5e623f5ac4725eebf977f535cfbfa31
  • Loading branch information
James Hauxwell authored and alegal-arm committed Aug 23, 2018
1 parent 640bea1 commit 5f7e621
Show file tree
Hide file tree
Showing 9 changed files with 29 additions and 37 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -415,8 +415,6 @@ KHR-GLES2.core.internalformat.texture2d.rgba_unsigned_short_4_4_4_4_rgba
KHR-GLES2.core.internalformat.texture2d.luminance_alpha_unsigned_byte_luminance_alpha
KHR-GLES2.core.internalformat.texture2d.luminance_unsigned_byte_luminance
KHR-GLES2.core.internalformat.texture2d.alpha_unsigned_byte_alpha
KHR-GLES2.core.internalformat.texture2d.rgb_unsigned_byte_rgb8
KHR-GLES2.core.internalformat.texture2d.rgba_unsigned_byte_rgba8
KHR-GLES2.core.internalformat.texture2d.rgba_unsigned_int_2_10_10_10_rev_rgba
KHR-GLES2.core.internalformat.texture2d.rgba_unsigned_int_2_10_10_10_rev_rgb10_a2
KHR-GLES2.core.internalformat.texture2d.rgba_unsigned_int_2_10_10_10_rev_rgb5_a1
Expand Down Expand Up @@ -453,8 +451,6 @@ KHR-GLES2.core.internalformat.copy_tex_image.rgba
KHR-GLES2.core.internalformat.copy_tex_image.alpha
KHR-GLES2.core.internalformat.copy_tex_image.luminance
KHR-GLES2.core.internalformat.copy_tex_image.luminance_alpha
KHR-GLES2.core.internalformat.copy_tex_image.rgba8
KHR-GLES2.core.internalformat.copy_tex_image.rgb8
KHR-GLES2.core.internalformat.copy_tex_image.rgb5_a1
KHR-GLES2.core.internalformat.copy_tex_image.rgb565
KHR-GLES2.core.internalformat.copy_tex_image.rgba4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3237,8 +3237,6 @@ KHR-GLES3.core.internalformat.texture2d.rgba_unsigned_short_4_4_4_4_rgba
KHR-GLES3.core.internalformat.texture2d.luminance_alpha_unsigned_byte_luminance_alpha
KHR-GLES3.core.internalformat.texture2d.luminance_unsigned_byte_luminance
KHR-GLES3.core.internalformat.texture2d.alpha_unsigned_byte_alpha
KHR-GLES3.core.internalformat.texture2d.rgb_unsigned_byte_rgb8
KHR-GLES3.core.internalformat.texture2d.rgba_unsigned_byte_rgba8
KHR-GLES3.core.internalformat.texture2d.rgba_unsigned_int_2_10_10_10_rev_rgba
KHR-GLES3.core.internalformat.texture2d.rgba_unsigned_int_2_10_10_10_rev_rgb10_a2
KHR-GLES3.core.internalformat.texture2d.rgba_unsigned_int_2_10_10_10_rev_rgb5_a1
Expand All @@ -3262,16 +3260,18 @@ KHR-GLES3.core.internalformat.texture2d.rgba_unsigned_short_5_5_5_1_rgba
KHR-GLES3.core.internalformat.texture2d.rgba_unsigned_short_5_5_5_1_rgb5_a1
KHR-GLES3.core.internalformat.texture2d.rgb_unsigned_short_5_6_5_rgb
KHR-GLES3.core.internalformat.texture2d.rgb_unsigned_short_5_6_5_rgb565
KHR-GLES3.core.internalformat.texture2d.rgb_unsigned_byte_rgb8
KHR-GLES3.core.internalformat.texture2d.rgba_unsigned_byte_rgba8
KHR-GLES3.core.internalformat.copy_tex_image.rgb
KHR-GLES3.core.internalformat.copy_tex_image.rgba
KHR-GLES3.core.internalformat.copy_tex_image.alpha
KHR-GLES3.core.internalformat.copy_tex_image.luminance
KHR-GLES3.core.internalformat.copy_tex_image.luminance_alpha
KHR-GLES3.core.internalformat.copy_tex_image.rgba8
KHR-GLES3.core.internalformat.copy_tex_image.rgb8
KHR-GLES3.core.internalformat.copy_tex_image.rgba4
KHR-GLES3.core.internalformat.copy_tex_image.rgb5_a1
KHR-GLES3.core.internalformat.copy_tex_image.rgb565
KHR-GLES3.core.internalformat.copy_tex_image.rgba8
KHR-GLES3.core.internalformat.copy_tex_image.rgb8
KHR-GLES3.core.internalformat.renderbuffer.rgba8
KHR-GLES3.core.internalformat.renderbuffer.rgb8
KHR-GLES3.core.internalformat.renderbuffer.rgb5_a1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2268,8 +2268,6 @@ KHR-GLES31.core.internalformat.texture2d.rgba_unsigned_short_4_4_4_4_rgba
KHR-GLES31.core.internalformat.texture2d.luminance_alpha_unsigned_byte_luminance_alpha
KHR-GLES31.core.internalformat.texture2d.luminance_unsigned_byte_luminance
KHR-GLES31.core.internalformat.texture2d.alpha_unsigned_byte_alpha
KHR-GLES31.core.internalformat.texture2d.rgb_unsigned_byte_rgb8
KHR-GLES31.core.internalformat.texture2d.rgba_unsigned_byte_rgba8
KHR-GLES31.core.internalformat.texture2d.rgba_unsigned_int_2_10_10_10_rev_rgba
KHR-GLES31.core.internalformat.texture2d.rgba_unsigned_int_2_10_10_10_rev_rgb10_a2
KHR-GLES31.core.internalformat.texture2d.rgba_unsigned_int_2_10_10_10_rev_rgb5_a1
Expand All @@ -2293,16 +2291,18 @@ KHR-GLES31.core.internalformat.texture2d.rgba_unsigned_short_5_5_5_1_rgba
KHR-GLES31.core.internalformat.texture2d.rgba_unsigned_short_5_5_5_1_rgb5_a1
KHR-GLES31.core.internalformat.texture2d.rgb_unsigned_short_5_6_5_rgb
KHR-GLES31.core.internalformat.texture2d.rgb_unsigned_short_5_6_5_rgb565
KHR-GLES31.core.internalformat.texture2d.rgb_unsigned_byte_rgb8
KHR-GLES31.core.internalformat.texture2d.rgba_unsigned_byte_rgba8
KHR-GLES31.core.internalformat.copy_tex_image.rgb
KHR-GLES31.core.internalformat.copy_tex_image.rgba
KHR-GLES31.core.internalformat.copy_tex_image.alpha
KHR-GLES31.core.internalformat.copy_tex_image.luminance
KHR-GLES31.core.internalformat.copy_tex_image.luminance_alpha
KHR-GLES31.core.internalformat.copy_tex_image.rgba8
KHR-GLES31.core.internalformat.copy_tex_image.rgb8
KHR-GLES31.core.internalformat.copy_tex_image.rgba4
KHR-GLES31.core.internalformat.copy_tex_image.rgb5_a1
KHR-GLES31.core.internalformat.copy_tex_image.rgb565
KHR-GLES31.core.internalformat.copy_tex_image.rgba8
KHR-GLES31.core.internalformat.copy_tex_image.rgb8
KHR-GLES31.core.internalformat.renderbuffer.rgba8
KHR-GLES31.core.internalformat.renderbuffer.rgb8
KHR-GLES31.core.internalformat.renderbuffer.rgb5_a1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1033,8 +1033,6 @@ KHR-GLES32.core.internalformat.texture2d.rgba_unsigned_short_4_4_4_4_rgba
KHR-GLES32.core.internalformat.texture2d.luminance_alpha_unsigned_byte_luminance_alpha
KHR-GLES32.core.internalformat.texture2d.luminance_unsigned_byte_luminance
KHR-GLES32.core.internalformat.texture2d.alpha_unsigned_byte_alpha
KHR-GLES32.core.internalformat.texture2d.rgb_unsigned_byte_rgb8
KHR-GLES32.core.internalformat.texture2d.rgba_unsigned_byte_rgba8
KHR-GLES32.core.internalformat.texture2d.rgba_unsigned_int_2_10_10_10_rev_rgba
KHR-GLES32.core.internalformat.texture2d.rgba_unsigned_int_2_10_10_10_rev_rgb10_a2
KHR-GLES32.core.internalformat.texture2d.rgba_unsigned_int_2_10_10_10_rev_rgb5_a1
Expand All @@ -1058,16 +1056,18 @@ KHR-GLES32.core.internalformat.texture2d.rgba_unsigned_short_5_5_5_1_rgba
KHR-GLES32.core.internalformat.texture2d.rgba_unsigned_short_5_5_5_1_rgb5_a1
KHR-GLES32.core.internalformat.texture2d.rgb_unsigned_short_5_6_5_rgb
KHR-GLES32.core.internalformat.texture2d.rgb_unsigned_short_5_6_5_rgb565
KHR-GLES32.core.internalformat.texture2d.rgb_unsigned_byte_rgb8
KHR-GLES32.core.internalformat.texture2d.rgba_unsigned_byte_rgba8
KHR-GLES32.core.internalformat.copy_tex_image.rgb
KHR-GLES32.core.internalformat.copy_tex_image.rgba
KHR-GLES32.core.internalformat.copy_tex_image.alpha
KHR-GLES32.core.internalformat.copy_tex_image.luminance
KHR-GLES32.core.internalformat.copy_tex_image.luminance_alpha
KHR-GLES32.core.internalformat.copy_tex_image.rgba8
KHR-GLES32.core.internalformat.copy_tex_image.rgb8
KHR-GLES32.core.internalformat.copy_tex_image.rgba4
KHR-GLES32.core.internalformat.copy_tex_image.rgb5_a1
KHR-GLES32.core.internalformat.copy_tex_image.rgb565
KHR-GLES32.core.internalformat.copy_tex_image.rgba8
KHR-GLES32.core.internalformat.copy_tex_image.rgb8
KHR-GLES32.core.internalformat.renderbuffer.rgba8
KHR-GLES32.core.internalformat.renderbuffer.rgb8
KHR-GLES32.core.internalformat.renderbuffer.rgb5_a1
Original file line number Diff line number Diff line change
Expand Up @@ -415,8 +415,6 @@ KHR-GLES2.core.internalformat.texture2d.rgba_unsigned_short_4_4_4_4_rgba
KHR-GLES2.core.internalformat.texture2d.luminance_alpha_unsigned_byte_luminance_alpha
KHR-GLES2.core.internalformat.texture2d.luminance_unsigned_byte_luminance
KHR-GLES2.core.internalformat.texture2d.alpha_unsigned_byte_alpha
KHR-GLES2.core.internalformat.texture2d.rgb_unsigned_byte_rgb8
KHR-GLES2.core.internalformat.texture2d.rgba_unsigned_byte_rgba8
KHR-GLES2.core.internalformat.texture2d.rgba_unsigned_int_2_10_10_10_rev_rgba
KHR-GLES2.core.internalformat.texture2d.rgba_unsigned_int_2_10_10_10_rev_rgb10_a2
KHR-GLES2.core.internalformat.texture2d.rgba_unsigned_int_2_10_10_10_rev_rgb5_a1
Expand Down Expand Up @@ -453,8 +451,6 @@ KHR-GLES2.core.internalformat.copy_tex_image.rgba
KHR-GLES2.core.internalformat.copy_tex_image.alpha
KHR-GLES2.core.internalformat.copy_tex_image.luminance
KHR-GLES2.core.internalformat.copy_tex_image.luminance_alpha
KHR-GLES2.core.internalformat.copy_tex_image.rgba8
KHR-GLES2.core.internalformat.copy_tex_image.rgb8
KHR-GLES2.core.internalformat.copy_tex_image.rgb5_a1
KHR-GLES2.core.internalformat.copy_tex_image.rgb565
KHR-GLES2.core.internalformat.copy_tex_image.rgba4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3237,8 +3237,6 @@ KHR-GLES3.core.internalformat.texture2d.rgba_unsigned_short_4_4_4_4_rgba
KHR-GLES3.core.internalformat.texture2d.luminance_alpha_unsigned_byte_luminance_alpha
KHR-GLES3.core.internalformat.texture2d.luminance_unsigned_byte_luminance
KHR-GLES3.core.internalformat.texture2d.alpha_unsigned_byte_alpha
KHR-GLES3.core.internalformat.texture2d.rgb_unsigned_byte_rgb8
KHR-GLES3.core.internalformat.texture2d.rgba_unsigned_byte_rgba8
KHR-GLES3.core.internalformat.texture2d.rgba_unsigned_int_2_10_10_10_rev_rgba
KHR-GLES3.core.internalformat.texture2d.rgba_unsigned_int_2_10_10_10_rev_rgb10_a2
KHR-GLES3.core.internalformat.texture2d.rgba_unsigned_int_2_10_10_10_rev_rgb5_a1
Expand All @@ -3262,16 +3260,18 @@ KHR-GLES3.core.internalformat.texture2d.rgba_unsigned_short_5_5_5_1_rgba
KHR-GLES3.core.internalformat.texture2d.rgba_unsigned_short_5_5_5_1_rgb5_a1
KHR-GLES3.core.internalformat.texture2d.rgb_unsigned_short_5_6_5_rgb
KHR-GLES3.core.internalformat.texture2d.rgb_unsigned_short_5_6_5_rgb565
KHR-GLES3.core.internalformat.texture2d.rgb_unsigned_byte_rgb8
KHR-GLES3.core.internalformat.texture2d.rgba_unsigned_byte_rgba8
KHR-GLES3.core.internalformat.copy_tex_image.rgb
KHR-GLES3.core.internalformat.copy_tex_image.rgba
KHR-GLES3.core.internalformat.copy_tex_image.alpha
KHR-GLES3.core.internalformat.copy_tex_image.luminance
KHR-GLES3.core.internalformat.copy_tex_image.luminance_alpha
KHR-GLES3.core.internalformat.copy_tex_image.rgba8
KHR-GLES3.core.internalformat.copy_tex_image.rgb8
KHR-GLES3.core.internalformat.copy_tex_image.rgba4
KHR-GLES3.core.internalformat.copy_tex_image.rgb5_a1
KHR-GLES3.core.internalformat.copy_tex_image.rgb565
KHR-GLES3.core.internalformat.copy_tex_image.rgba8
KHR-GLES3.core.internalformat.copy_tex_image.rgb8
KHR-GLES3.core.internalformat.renderbuffer.rgba8
KHR-GLES3.core.internalformat.renderbuffer.rgb8
KHR-GLES3.core.internalformat.renderbuffer.rgb5_a1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2268,8 +2268,6 @@ KHR-GLES31.core.internalformat.texture2d.rgba_unsigned_short_4_4_4_4_rgba
KHR-GLES31.core.internalformat.texture2d.luminance_alpha_unsigned_byte_luminance_alpha
KHR-GLES31.core.internalformat.texture2d.luminance_unsigned_byte_luminance
KHR-GLES31.core.internalformat.texture2d.alpha_unsigned_byte_alpha
KHR-GLES31.core.internalformat.texture2d.rgb_unsigned_byte_rgb8
KHR-GLES31.core.internalformat.texture2d.rgba_unsigned_byte_rgba8
KHR-GLES31.core.internalformat.texture2d.rgba_unsigned_int_2_10_10_10_rev_rgba
KHR-GLES31.core.internalformat.texture2d.rgba_unsigned_int_2_10_10_10_rev_rgb10_a2
KHR-GLES31.core.internalformat.texture2d.rgba_unsigned_int_2_10_10_10_rev_rgb5_a1
Expand All @@ -2293,16 +2291,18 @@ KHR-GLES31.core.internalformat.texture2d.rgba_unsigned_short_5_5_5_1_rgba
KHR-GLES31.core.internalformat.texture2d.rgba_unsigned_short_5_5_5_1_rgb5_a1
KHR-GLES31.core.internalformat.texture2d.rgb_unsigned_short_5_6_5_rgb
KHR-GLES31.core.internalformat.texture2d.rgb_unsigned_short_5_6_5_rgb565
KHR-GLES31.core.internalformat.texture2d.rgb_unsigned_byte_rgb8
KHR-GLES31.core.internalformat.texture2d.rgba_unsigned_byte_rgba8
KHR-GLES31.core.internalformat.copy_tex_image.rgb
KHR-GLES31.core.internalformat.copy_tex_image.rgba
KHR-GLES31.core.internalformat.copy_tex_image.alpha
KHR-GLES31.core.internalformat.copy_tex_image.luminance
KHR-GLES31.core.internalformat.copy_tex_image.luminance_alpha
KHR-GLES31.core.internalformat.copy_tex_image.rgba8
KHR-GLES31.core.internalformat.copy_tex_image.rgb8
KHR-GLES31.core.internalformat.copy_tex_image.rgba4
KHR-GLES31.core.internalformat.copy_tex_image.rgb5_a1
KHR-GLES31.core.internalformat.copy_tex_image.rgb565
KHR-GLES31.core.internalformat.copy_tex_image.rgba8
KHR-GLES31.core.internalformat.copy_tex_image.rgb8
KHR-GLES31.core.internalformat.renderbuffer.rgba8
KHR-GLES31.core.internalformat.renderbuffer.rgb8
KHR-GLES31.core.internalformat.renderbuffer.rgb5_a1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1033,8 +1033,6 @@ KHR-GLES32.core.internalformat.texture2d.rgba_unsigned_short_4_4_4_4_rgba
KHR-GLES32.core.internalformat.texture2d.luminance_alpha_unsigned_byte_luminance_alpha
KHR-GLES32.core.internalformat.texture2d.luminance_unsigned_byte_luminance
KHR-GLES32.core.internalformat.texture2d.alpha_unsigned_byte_alpha
KHR-GLES32.core.internalformat.texture2d.rgb_unsigned_byte_rgb8
KHR-GLES32.core.internalformat.texture2d.rgba_unsigned_byte_rgba8
KHR-GLES32.core.internalformat.texture2d.rgba_unsigned_int_2_10_10_10_rev_rgba
KHR-GLES32.core.internalformat.texture2d.rgba_unsigned_int_2_10_10_10_rev_rgb10_a2
KHR-GLES32.core.internalformat.texture2d.rgba_unsigned_int_2_10_10_10_rev_rgb5_a1
Expand All @@ -1058,16 +1056,18 @@ KHR-GLES32.core.internalformat.texture2d.rgba_unsigned_short_5_5_5_1_rgba
KHR-GLES32.core.internalformat.texture2d.rgba_unsigned_short_5_5_5_1_rgb5_a1
KHR-GLES32.core.internalformat.texture2d.rgb_unsigned_short_5_6_5_rgb
KHR-GLES32.core.internalformat.texture2d.rgb_unsigned_short_5_6_5_rgb565
KHR-GLES32.core.internalformat.texture2d.rgb_unsigned_byte_rgb8
KHR-GLES32.core.internalformat.texture2d.rgba_unsigned_byte_rgba8
KHR-GLES32.core.internalformat.copy_tex_image.rgb
KHR-GLES32.core.internalformat.copy_tex_image.rgba
KHR-GLES32.core.internalformat.copy_tex_image.alpha
KHR-GLES32.core.internalformat.copy_tex_image.luminance
KHR-GLES32.core.internalformat.copy_tex_image.luminance_alpha
KHR-GLES32.core.internalformat.copy_tex_image.rgba8
KHR-GLES32.core.internalformat.copy_tex_image.rgb8
KHR-GLES32.core.internalformat.copy_tex_image.rgba4
KHR-GLES32.core.internalformat.copy_tex_image.rgb5_a1
KHR-GLES32.core.internalformat.copy_tex_image.rgb565
KHR-GLES32.core.internalformat.copy_tex_image.rgba8
KHR-GLES32.core.internalformat.copy_tex_image.rgb8
KHR-GLES32.core.internalformat.renderbuffer.rgba8
KHR-GLES32.core.internalformat.renderbuffer.rgb8
KHR-GLES32.core.internalformat.renderbuffer.rgb5_a1
10 changes: 5 additions & 5 deletions external/openglcts/modules/common/glcInternalformatTests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1395,8 +1395,6 @@ void InternalformatTests::getESTestData(TestData& testData, glu::ContextType& co
TF(GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, GL_LUMINANCE_ALPHA),
TF(GL_LUMINANCE, GL_UNSIGNED_BYTE, GL_LUMINANCE),
TF(GL_ALPHA, GL_UNSIGNED_BYTE, GL_ALPHA),
TF(GL_RGB, GL_UNSIGNED_BYTE, GL_RGB8, OES_rgb8_rgba8),
TF(GL_RGBA, GL_UNSIGNED_BYTE, GL_RGBA8, OES_rgb8_rgba8),
TF(GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV, GL_RGBA, EXT_texture_type_2_10_10_10_REV),
TF(GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV, GL_RGB10_A2, EXT_texture_type_2_10_10_10_REV),
TF(GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV, GL_RGB5_A1, EXT_texture_type_2_10_10_10_REV),
Expand All @@ -1420,8 +1418,6 @@ void InternalformatTests::getESTestData(TestData& testData, glu::ContextType& co
CF(GL_ALPHA),
CF(GL_LUMINANCE),
CF(GL_LUMINANCE_ALPHA),
CF(GL_RGBA8, OES_rgb8_rgba8),
CF(GL_RGB8, OES_rgb8_rgba8),
};

RenderbufferFormat commonRenderbufferFormats[] = {
Expand All @@ -1444,12 +1440,16 @@ void InternalformatTests::getESTestData(TestData& testData, glu::ContextType& co
TF(GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1, GL_RGB5_A1),
TF(GL_RGB, GL_UNSIGNED_SHORT_5_6_5, GL_RGB),
TF(GL_RGB, GL_UNSIGNED_SHORT_5_6_5, GL_RGB565),
TF(GL_RGB, GL_UNSIGNED_BYTE, GL_RGB8),
TF(GL_RGBA, GL_UNSIGNED_BYTE, GL_RGBA8),
};

CopyTexImageFormat es3CopyTexImageFormats[] = {
CF(GL_RGBA4),
CF(GL_RGB5_A1),
CF(GL_RGB565)
CF(GL_RGB565),
CF(GL_RGBA8),
CF(GL_RGB8),
};

RenderbufferFormat es3RenderbufferFormats[] = {
Expand Down

0 comments on commit 5f7e621

Please sign in to comment.