Fix srgb_unsigned_byte RBO test regression with NV_sRGB_formats extension.

A bugfix to make unsized SRGB format with UNSIGNED_BYTE type renderable
on texture targets erroneously caused test cases to expect same
renderablity on RBO targets as well. RBOs cannot be created with an
unsized internal formats. This change removes the erroneously added
expectation of renderablity from RBO targets.

Bug: 18755796
Change-Id: I8beb906ebccc1305fa910f18f355121623a1aca1

diff --git a/modules/glshared/glsFboCompletenessTests.cpp b/modules/glshared/glsFboCompletenessTests.cpp
index b31e558..6033acf 100644 (file)
--- a/modules/glshared/glsFboCompletenessTests.cpp
+++ b/modules/glshared/glsFboCompletenessTests.cpp
@@ -186,7 +186,12 @@ static const FormatKey s_extSrgbNonRenderableTexFormats[] =
        GL_SRGB8,
 };
 
-static const FormatKey s_nvSrgbFormatsFormats[] =
+static const FormatKey s_nvSrgbFormatsRboFormats[] =
+{
+       GL_SRGB8,
+};
+
+static const FormatKey s_nvSrgbFormatsTextureFormats[] =
 {
        GL_SRGB8,
 
@@ -311,8 +316,13 @@ static const FormatExtEntry s_esExtFormats[] =
        },
        {
                "GL_NV_sRGB_formats",
-               REQUIRED_RENDERABLE | COLOR_RENDERABLE | TEXTURE_VALID | RENDERBUFFER_VALID,
-               GLS_ARRAY_RANGE(s_nvSrgbFormatsFormats)
+               REQUIRED_RENDERABLE | COLOR_RENDERABLE | RENDERBUFFER_VALID,
+               GLS_ARRAY_RANGE(s_nvSrgbFormatsRboFormats)
+       },
+       {
+               "GL_NV_sRGB_formats",
+               REQUIRED_RENDERABLE | COLOR_RENDERABLE | TEXTURE_VALID,
+               GLS_ARRAY_RANGE(s_nvSrgbFormatsTextureFormats)
        },
 
         // In Khronos bug 7333 discussion, the consensus is that these texture