resolve merge conflicts of eb48f49dd to oc-dev

Test: scripts/check_build_sanity.py
Change-Id: Iebca655530a000eb96e744fae44a4a9f740c91af

diff --git a/modules/glshared/glsFboCompletenessTests.cpp b/modules/glshared/glsFboCompletenessTests.cpp
index 791d8c9..35940bf 100644 (file)
--- a/modules/glshared/glsFboCompletenessTests.cpp
+++ b/modules/glshared/glsFboCompletenessTests.cpp
@@ -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",
                (deUint32)(DEPTH_RENDERABLE | STENCIL_RENDERABLE | TEXTURE_VALID),
                GLS_ARRAY_RANGE(s_oesPackedDepthStencilTexFormats)
        },