Merge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat...
authorPyry Haulos <phaulos@google.com>
Wed, 3 May 2017 16:09:13 +0000 (16:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 May 2017 16:09:13 +0000 (16:09 +0000)
am: 26ff3a55fd

Change-Id: I546fb08c2c59d10ca3a95fd2307251e11d72623e

modules/glshared/glsFboCompletenessTests.cpp

index 0426a83..5b0ac9c 100644 (file)
@@ -228,7 +228,7 @@ static const FormatExtEntry s_esExtFormats[] =
                GLS_ARRAY_RANGE(s_oesPackedDepthStencilSizedFormats)
        },
        {
-               "GL_OES_packed_depth_stencil",
+               "GL_OES_packed_depth_stencil GL_OES_depth_texture",
                DEPTH_RENDERABLE | STENCIL_RENDERABLE | TEXTURE_VALID,
                GLS_ARRAY_RANGE(s_oesPackedDepthStencilTexFormats)
        },