resolve merge conflicts of eb48f49dd to oc-dev

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

diff --cc modules/glshared/glsFboCompletenessTests.cpp
index 791d8c9,5b0ac9c..35940bf
--- 1/modules/glshared/glsFboCompletenessTests.cpp
--- 2/modules/glshared/glsFboCompletenessTests.cpp
+++ b/modules/glshared/glsFboCompletenessTests.cpp
@@@ -228,16 -228,10 +228,16 @@@ static const FormatExtEntry s_esExtForm
                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,
 +              (deUint32)(DEPTH_RENDERABLE | STENCIL_RENDERABLE | TEXTURE_VALID),
                GLS_ARRAY_RANGE(s_oesPackedDepthStencilTexFormats)
        },
 +      // The ANGLE extension incorporates GL_OES_depth_texture/GL_OES_packed_depth_stencil.
 +      {
 +              "GL_ANGLE_depth_texture",
 +              (deUint32)(REQUIRED_RENDERABLE | DEPTH_RENDERABLE | TEXTURE_VALID),
 +              GLS_ARRAY_RANGE(s_oesDepthTextureFormats),
 +      },
        // \todo [2013-12-10 lauri] Find out if OES_texture_half_float is really a
        // requirement on ES3 also. Or is color_buffer_half_float applicatble at
        // all on ES3, since there's also EXT_color_buffer_float?