projects
/
platform
/
upstream
/
VK-GL-CTS.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
resolve merge conflicts of eb48f49dd to oc-dev
[platform/upstream/VK-GL-CTS.git]
/
modules
/
glshared
/
glsFboCompletenessTests.cpp
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)
},
{
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)
},
(deUint32)(DEPTH_RENDERABLE | STENCIL_RENDERABLE | TEXTURE_VALID),
GLS_ARRAY_RANGE(s_oesPackedDepthStencilTexFormats)
},