Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc |
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc |
index 910cb0104b214ec80de4dd7872f5a70f1904a145..4c580674e0f11b7e4e89b50470a8f7466cd9a0da 100644 |
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc |
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc |
@@ -65,21 +65,22 @@ class GLES2DecoderTest : public GLES2DecoderTestBase { |
bool init); |
}; |
-class GLES2DecoderTestWithExtensions |
+class GLES2DecoderTestWithExtensionsOnGLES2 |
: public GLES2DecoderTest, |
public ::testing::WithParamInterface<const char*> { |
public: |
- GLES2DecoderTestWithExtensions() {} |
+ GLES2DecoderTestWithExtensionsOnGLES2() {} |
virtual void SetUp() { |
- InitDecoder(GetParam(), // extensions |
- true, // has alpha |
- true, // has depth |
- false, // has stencil |
- true, // request alpha |
- true, // request depth |
- false, // request stencil |
- false); // bind generates resource |
+ InitDecoder(GetParam(), // extensions |
+ "opengl es 2.0", // gl version |
+ true, // has alpha |
+ true, // has depth |
+ false, // has stencil |
+ true, // request alpha |
+ true, // request depth |
+ false, // request stencil |
+ false); // bind generates resource |
} |
}; |
@@ -102,6 +103,7 @@ class GLES2DecoderGeometryInstancingTest : public GLES2DecoderWithShaderTest { |
virtual void SetUp() { |
InitDecoder( |
"GL_ANGLE_instanced_arrays", // extensions |
+ "opengl es 2.0", // gl version |
true, // has alpha |
true, // has depth |
false, // has stencil |
@@ -120,6 +122,7 @@ class GLES2DecoderRGBBackbufferTest : public GLES2DecoderWithShaderTest { |
virtual void SetUp() { |
InitDecoder( |
"", // extensions |
+ "3.0", // gl version |
false, // has alpha |
false, // has depth |
false, // has stencil |
@@ -3733,6 +3736,7 @@ TEST_F(GLES2DecoderRGBBackbufferTest, RGBBackbufferColorMaskFBO) { |
TEST_F(GLES2DecoderManualInitTest, ActualAlphaMatchesRequestedAlpha) { |
InitDecoder( |
"", // extensions |
+ "3.0", // gl version |
true, // has alpha |
false, // has depth |
false, // has stencil |
@@ -3764,6 +3768,7 @@ TEST_F(GLES2DecoderManualInitTest, ActualAlphaMatchesRequestedAlpha) { |
TEST_F(GLES2DecoderManualInitTest, ActualAlphaDoesNotMatchRequestedAlpha) { |
InitDecoder( |
"", // extensions |
+ "3.0", // gl version |
true, // has alpha |
false, // has depth |
false, // has stencil |
@@ -3795,6 +3800,7 @@ TEST_F(GLES2DecoderManualInitTest, ActualAlphaDoesNotMatchRequestedAlpha) { |
TEST_F(GLES2DecoderManualInitTest, ActualDepthMatchesRequestedDepth) { |
InitDecoder( |
"", // extensions |
+ "3.0", // gl version |
false, // has alpha |
true, // has depth |
false, // has stencil |
@@ -3826,6 +3832,7 @@ TEST_F(GLES2DecoderManualInitTest, ActualDepthMatchesRequestedDepth) { |
TEST_F(GLES2DecoderManualInitTest, ActualDepthDoesNotMatchRequestedDepth) { |
InitDecoder( |
"", // extensions |
+ "3.0", // gl version |
false, // has alpha |
true, // has depth |
false, // has stencil |
@@ -3857,6 +3864,7 @@ TEST_F(GLES2DecoderManualInitTest, ActualDepthDoesNotMatchRequestedDepth) { |
TEST_F(GLES2DecoderManualInitTest, ActualStencilMatchesRequestedStencil) { |
InitDecoder( |
"", // extensions |
+ "3.0", // gl version |
false, // has alpha |
false, // has depth |
true, // has stencil |
@@ -3888,6 +3896,7 @@ TEST_F(GLES2DecoderManualInitTest, ActualStencilMatchesRequestedStencil) { |
TEST_F(GLES2DecoderManualInitTest, ActualStencilDoesNotMatchRequestedStencil) { |
InitDecoder( |
"", // extensions |
+ "3.0", // gl version |
false, // has alpha |
false, // has depth |
true, // has stencil |
@@ -3919,6 +3928,7 @@ TEST_F(GLES2DecoderManualInitTest, ActualStencilDoesNotMatchRequestedStencil) { |
TEST_F(GLES2DecoderManualInitTest, DepthEnableWithDepth) { |
InitDecoder( |
"", // extensions |
+ "3.0", // gl version |
false, // has alpha |
true, // has depth |
false, // has stencil |
@@ -3981,6 +3991,7 @@ TEST_F(GLES2DecoderManualInitTest, DepthEnableWithDepth) { |
TEST_F(GLES2DecoderManualInitTest, DepthEnableWithoutRequestedDepth) { |
InitDecoder( |
"", // extensions |
+ "3.0", // gl version |
false, // has alpha |
true, // has depth |
false, // has stencil |
@@ -4042,6 +4053,7 @@ TEST_F(GLES2DecoderManualInitTest, DepthEnableWithoutRequestedDepth) { |
TEST_F(GLES2DecoderManualInitTest, StencilEnableWithStencil) { |
InitDecoder( |
"", // extensions |
+ "3.0", // gl version |
false, // has alpha |
false, // has depth |
true, // has stencil |
@@ -4103,6 +4115,7 @@ TEST_F(GLES2DecoderManualInitTest, StencilEnableWithStencil) { |
TEST_F(GLES2DecoderManualInitTest, StencilEnableWithoutRequestedStencil) { |
InitDecoder( |
"", // extensions |
+ "3.0", // gl version |
false, // has alpha |
false, // has depth |
true, // has stencil |
@@ -4164,6 +4177,7 @@ TEST_F(GLES2DecoderManualInitTest, StencilEnableWithoutRequestedStencil) { |
TEST_F(GLES2DecoderManualInitTest, PackedDepthStencilReportsCorrectValues) { |
InitDecoder( |
"GL_OES_packed_depth_stencil", // extensions |
+ "opengl es 2.0", // gl version |
false, // has alpha |
true, // has depth |
true, // has stencil |
@@ -4208,6 +4222,7 @@ TEST_F(GLES2DecoderManualInitTest, PackedDepthStencilReportsCorrectValues) { |
TEST_F(GLES2DecoderManualInitTest, PackedDepthStencilNoRequestedStencil) { |
InitDecoder( |
"GL_OES_packed_depth_stencil", // extensions |
+ "opengl es 2.0", // gl version |
false, // has alpha |
true, // has depth |
true, // has stencil |
@@ -4252,6 +4267,7 @@ TEST_F(GLES2DecoderManualInitTest, PackedDepthStencilNoRequestedStencil) { |
TEST_F(GLES2DecoderManualInitTest, PackedDepthStencilRenderbufferDepth) { |
InitDecoder( |
"GL_OES_packed_depth_stencil", // extensions |
+ "opengl es 2.0", // gl version |
false, // has alpha |
false, // has depth |
false, // has stencil |
@@ -4323,6 +4339,7 @@ TEST_F(GLES2DecoderManualInitTest, PackedDepthStencilRenderbufferDepth) { |
TEST_F(GLES2DecoderManualInitTest, PackedDepthStencilRenderbufferStencil) { |
InitDecoder( |
"GL_OES_packed_depth_stencil", // extensions |
+ "opengl es 2.0", // gl version |
false, // has alpha |
false, // has depth |
false, // has stencil |
@@ -4726,6 +4743,7 @@ TEST_F(GLES2DecoderManualInitTest, |
RenderbufferStorageMultisampleCHROMIUMGLError) { |
InitDecoder( |
"GL_EXT_framebuffer_multisample", // extensions |
+ "2.1", // gl version |
false, // has alpha |
false, // has depth |
false, // has stencil |
@@ -4753,6 +4771,7 @@ TEST_F(GLES2DecoderManualInitTest, |
RenderbufferStorageMultisampleCHROMIUMBadArgs) { |
InitDecoder( |
"GL_EXT_framebuffer_multisample", // extensions |
+ "2.1", // gl version |
false, // has alpha |
false, // has depth |
false, // has stencil |
@@ -4783,6 +4802,7 @@ TEST_F(GLES2DecoderManualInitTest, |
TEST_F(GLES2DecoderManualInitTest, RenderbufferStorageMultisampleCHROMIUM) { |
InitDecoder( |
"GL_EXT_framebuffer_multisample", // extensions |
+ "2.1", // gl version |
false, // has alpha |
false, // has depth |
false, // has stencil |
@@ -4819,6 +4839,7 @@ TEST_F(GLES2DecoderManualInitTest, |
RenderbufferStorageMultisampleEXTNotSupported) { |
InitDecoder( |
"GL_EXT_framebuffer_multisample", // extensions |
+ "2.1", // gl version |
false, // has alpha |
false, // has depth |
false, // has stencil |
@@ -4838,7 +4859,7 @@ TEST_F(GLES2DecoderManualInitTest, |
} |
class GLES2DecoderMultisampledRenderToTextureTest |
- : public GLES2DecoderTestWithExtensions {}; |
+ : public GLES2DecoderTestWithExtensionsOnGLES2 {}; |
TEST_P(GLES2DecoderMultisampledRenderToTextureTest, |
NotCompatibleWithRenderbufferStorageMultisampleCHROMIUM) { |
@@ -4937,6 +4958,7 @@ static bool ValueInArray(GLint value, GLint* array, GLint count) { |
TEST_F(GLES2DecoderManualInitTest, GetCompressedTextureFormats) { |
InitDecoder( |
"GL_EXT_texture_compression_s3tc", // extensions |
+ "3.0", // gl version |
false, // has alpha |
false, // has depth |
false, // has stencil |
@@ -4994,6 +5016,7 @@ TEST_F(GLES2DecoderManualInitTest, GetCompressedTextureFormats) { |
TEST_F(GLES2DecoderManualInitTest, GetNoCompressedTextureFormats) { |
InitDecoder( |
"", // extensions |
+ "3.0", // gl version |
false, // has alpha |
false, // has depth |
false, // has stencil |
@@ -5038,6 +5061,7 @@ TEST_F(GLES2DecoderManualInitTest, GetNoCompressedTextureFormats) { |
TEST_F(GLES2DecoderManualInitTest, CompressedTexImage2DBucketBadBucket) { |
InitDecoder( |
"GL_EXT_texture_compression_s3tc", // extensions |
+ "3.0", // gl version |
false, // has alpha |
false, // has depth |
false, // has stencil |
@@ -5072,6 +5096,7 @@ struct S3TCTestData { |
TEST_F(GLES2DecoderManualInitTest, CompressedTexImage2DS3TC) { |
InitDecoder( |
"GL_EXT_texture_compression_s3tc", // extensions |
+ "3.0", // gl version |
false, // has alpha |
false, // has depth |
false, // has stencil |
@@ -5226,6 +5251,7 @@ TEST_F(GLES2DecoderManualInitTest, CompressedTexImage2DS3TC) { |
TEST_F(GLES2DecoderManualInitTest, CompressedTexImage2DETC1) { |
InitDecoder( |
"GL_OES_compressed_ETC1_RGB8_texture", // extensions |
+ "opengl es 2.0", // gl version |
false, // has alpha |
false, // has depth |
false, // has stencil |
@@ -5298,6 +5324,7 @@ TEST_F(GLES2DecoderManualInitTest, CompressedTexImage2DETC1) { |
TEST_F(GLES2DecoderManualInitTest, GetCompressedTextureFormatsETC1) { |
InitDecoder( |
"GL_OES_compressed_ETC1_RGB8_texture", // extensions |
+ "opengl es 2.0", // gl version |
false, // has alpha |
false, // has depth |
false, // has stencil |
@@ -5373,6 +5400,7 @@ TEST_F(GLES2DecoderWithShaderTest, GetProgramInfoCHROMIUMInvalidArgs) { |
TEST_F(GLES2DecoderManualInitTest, EGLImageExternalBindTexture) { |
InitDecoder( |
"GL_OES_EGL_image_external", // extensions |
+ "opengl es 2.0", // gl version |
false, // has alpha |
false, // has depth |
false, // has stencil |
@@ -5395,6 +5423,7 @@ TEST_F(GLES2DecoderManualInitTest, EGLImageExternalBindTexture) { |
TEST_F(GLES2DecoderManualInitTest, EGLImageExternalGetBinding) { |
InitDecoder( |
"GL_OES_EGL_image_external", // extensions |
+ "opengl es 2.0", // gl version |
false, // has alpha |
false, // has depth |
false, // has stencil |
@@ -5428,6 +5457,7 @@ TEST_F(GLES2DecoderManualInitTest, EGLImageExternalGetBinding) { |
TEST_F(GLES2DecoderManualInitTest, EGLImageExternalTextureDefaults) { |
InitDecoder( |
"GL_OES_EGL_image_external", // extensions |
+ "opengl es 2.0", // gl version |
false, // has alpha |
false, // has depth |
false, // has stencil |
@@ -5449,6 +5479,7 @@ TEST_F(GLES2DecoderManualInitTest, EGLImageExternalTextureDefaults) { |
TEST_F(GLES2DecoderManualInitTest, EGLImageExternalTextureParam) { |
InitDecoder( |
"GL_OES_EGL_image_external", // extensions |
+ "opengl es 2.0", // gl version |
false, // has alpha |
false, // has depth |
false, // has stencil |
@@ -5508,6 +5539,7 @@ TEST_F(GLES2DecoderManualInitTest, EGLImageExternalTextureParam) { |
TEST_F(GLES2DecoderManualInitTest, EGLImageExternalTextureParamInvalid) { |
InitDecoder( |
"GL_OES_EGL_image_external", // extensions |
+ "opengl es 2.0", // gl version |
false, // has alpha |
false, // has depth |
false, // has stencil |
@@ -5549,6 +5581,7 @@ TEST_F(GLES2DecoderManualInitTest, EGLImageExternalTextureParamInvalid) { |
TEST_F(GLES2DecoderManualInitTest, EGLImageExternalTexImage2DError) { |
InitDecoder( |
"GL_OES_EGL_image_external", // extensions |
+ "opengl es 2.0", // gl version |
false, // has alpha |
false, // has depth |
false, // has stencil |
@@ -5579,6 +5612,7 @@ TEST_F(GLES2DecoderManualInitTest, EGLImageExternalTexImage2DError) { |
TEST_F(GLES2DecoderManualInitTest, BindGeneratesResourceFalse) { |
InitDecoder( |
"", // extensions |
+ "3.0", // gl version |
false, // has alpha |
false, // has depth |
false, // has stencil |
@@ -5608,6 +5642,7 @@ TEST_F(GLES2DecoderManualInitTest, CreateStreamTextureCHROMIUM) { |
const GLuint kObjectId = 123; |
InitDecoder( |
"GL_CHROMIUM_stream_texture", // extensions |
+ "3.0", // gl version |
false, // has alpha |
false, // has depth |
false, // has stencil |
@@ -5640,6 +5675,7 @@ TEST_F(GLES2DecoderManualInitTest, CreateStreamTextureCHROMIUM) { |
TEST_F(GLES2DecoderManualInitTest, CreateStreamTextureCHROMIUMBadId) { |
InitDecoder( |
"GL_CHROMIUM_stream_texture", // extensions |
+ "3.0", // gl version |
false, // has alpha |
false, // has depth |
false, // has stencil |
@@ -5660,6 +5696,7 @@ TEST_F(GLES2DecoderManualInitTest, CreateStreamTextureCHROMIUMBadId) { |
TEST_F(GLES2DecoderManualInitTest, CreateStreamTextureCHROMIUMAlreadyBound) { |
InitDecoder( |
"GL_CHROMIUM_stream_texture", // extensions |
+ "3.0", // gl version |
false, // has alpha |
false, // has depth |
false, // has stencil |
@@ -5681,6 +5718,7 @@ TEST_F(GLES2DecoderManualInitTest, CreateStreamTextureCHROMIUMAlreadyBound) { |
TEST_F(GLES2DecoderManualInitTest, CreateStreamTextureCHROMIUMAlreadySet) { |
InitDecoder( |
"GL_CHROMIUM_stream_texture", // extensions |
+ "3.0", // gl version |
false, // has alpha |
false, // has depth |
false, // has stencil |
@@ -5706,6 +5744,7 @@ TEST_F(GLES2DecoderManualInitTest, CreateStreamTextureCHROMIUMAlreadySet) { |
TEST_F(GLES2DecoderManualInitTest, DrawStreamTextureCHROMIUM) { |
InitDecoder( |
"GL_CHROMIUM_stream_texture GL_OES_EGL_image_external", // extensions |
+ "opengl es 2.0", // gl version |
true, // has alpha |
true, // has depth |
false, // has stencil |
@@ -5755,6 +5794,7 @@ TEST_F(GLES2DecoderManualInitTest, DrawStreamTextureCHROMIUM) { |
TEST_F(GLES2DecoderManualInitTest, BindStreamTextureCHROMIUMInvalid) { |
InitDecoder( |
"GL_CHROMIUM_stream_texture", // extensions |
+ "3.0", // gl version |
false, // has alpha |
false, // has depth |
false, // has stencil |
@@ -5785,6 +5825,7 @@ TEST_F(GLES2DecoderManualInitTest, BindStreamTextureCHROMIUMInvalid) { |
TEST_F(GLES2DecoderManualInitTest, DestroyStreamTextureCHROMIUM) { |
InitDecoder( |
"GL_CHROMIUM_stream_texture", // extensions |
+ "3.0", // gl version |
false, // has alpha |
false, // has depth |
false, // has stencil |
@@ -5812,6 +5853,7 @@ TEST_F(GLES2DecoderManualInitTest, DestroyStreamTextureCHROMIUM) { |
TEST_F(GLES2DecoderManualInitTest, DestroyStreamTextureCHROMIUMInvalid) { |
InitDecoder( |
"GL_CHROMIUM_stream_texture", // extensions |
+ "3.0", // gl version |
false, // has alpha |
false, // has depth |
false, // has stencil |
@@ -5829,6 +5871,7 @@ TEST_F(GLES2DecoderManualInitTest, DestroyStreamTextureCHROMIUMInvalid) { |
TEST_F(GLES2DecoderManualInitTest, DestroyStreamTextureCHROMIUMBadId) { |
InitDecoder( |
"GL_CHROMIUM_stream_texture", // extensions |
+ "3.0", // gl version |
false, // has alpha |
false, // has depth |
false, // has stencil |
@@ -5846,6 +5889,7 @@ TEST_F(GLES2DecoderManualInitTest, DestroyStreamTextureCHROMIUMBadId) { |
TEST_F(GLES2DecoderManualInitTest, StreamTextureCHROMIUMNullMgr) { |
InitDecoder( |
"", // extensions |
+ "3.0", // gl version |
false, // has alpha |
false, // has depth |
false, // has stencil |
@@ -5872,6 +5916,7 @@ TEST_F(GLES2DecoderManualInitTest, ReCreateStreamTextureCHROMIUM) { |
const GLuint kObjectId = 123; |
InitDecoder( |
"GL_CHROMIUM_stream_texture GL_OES_EGL_image_external", // extensions |
+ "opengl es 2.0", // gl version |
false, // has alpha |
false, // has depth |
false, // has stencil |
@@ -5916,6 +5961,7 @@ TEST_F(GLES2DecoderManualInitTest, ReCreateStreamTextureCHROMIUM) { |
TEST_F(GLES2DecoderManualInitTest, ProduceAndConsumeStreamTextureCHROMIUM) { |
InitDecoder( |
"GL_CHROMIUM_stream_texture GL_OES_EGL_image_external", // extensions |
+ "opengl es 2.0", // gl version |
false, // has alpha |
false, // has depth |
false, // has stencil |
@@ -5977,6 +6023,7 @@ TEST_F(GLES2DecoderManualInitTest, ProduceAndConsumeStreamTextureCHROMIUM) { |
TEST_F(GLES2DecoderManualInitTest, ARBTextureRectangleBindTexture) { |
InitDecoder( |
"GL_ARB_texture_rectangle", // extensions |
+ "3.0", // gl version |
false, // has alpha |
false, // has depth |
false, // has stencil |
@@ -5999,6 +6046,7 @@ TEST_F(GLES2DecoderManualInitTest, ARBTextureRectangleBindTexture) { |
TEST_F(GLES2DecoderManualInitTest, ARBTextureRectangleGetBinding) { |
InitDecoder( |
"GL_ARB_texture_rectangle", // extensions |
+ "3.0", // gl version |
false, // has alpha |
false, // has depth |
false, // has stencil |
@@ -6033,6 +6081,7 @@ TEST_F(GLES2DecoderManualInitTest, ARBTextureRectangleGetBinding) { |
TEST_F(GLES2DecoderManualInitTest, ARBTextureRectangleTextureDefaults) { |
InitDecoder( |
"GL_ARB_texture_rectangle", // extensions |
+ "3.0", // gl version |
false, // has alpha |
false, // has depth |
false, // has stencil |
@@ -6054,6 +6103,7 @@ TEST_F(GLES2DecoderManualInitTest, ARBTextureRectangleTextureDefaults) { |
TEST_F(GLES2DecoderManualInitTest, ARBTextureRectangleTextureParam) { |
InitDecoder( |
"GL_ARB_texture_rectangle", // extensions |
+ "3.0", // gl version |
false, // has alpha |
false, // has depth |
false, // has stencil |
@@ -6113,6 +6163,7 @@ TEST_F(GLES2DecoderManualInitTest, ARBTextureRectangleTextureParam) { |
TEST_F(GLES2DecoderManualInitTest, ARBTextureRectangleTextureParamInvalid) { |
InitDecoder( |
"GL_ARB_texture_rectangle", // extensions |
+ "3.0", // gl version |
false, // has alpha |
false, // has depth |
false, // has stencil |
@@ -6154,6 +6205,7 @@ TEST_F(GLES2DecoderManualInitTest, ARBTextureRectangleTextureParamInvalid) { |
TEST_F(GLES2DecoderManualInitTest, ARBTextureRectangleTexImage2DError) { |
InitDecoder( |
"GL_ARB_texture_rectangle", // extensions |
+ "3.0", // gl version |
false, // has alpha |
false, // has depth |
false, // has stencil |
@@ -6257,6 +6309,7 @@ TEST_F( |
base::IntToString(gpu::TEXSUBIMAGE2D_FASTER_THAN_TEXIMAGE2D)); |
InitDecoderWithCommandLine( |
"", // extensions |
+ "3.0", // gl version |
false, // has alpha |
false, // has depth |
false, // has stencil |
@@ -6548,6 +6601,7 @@ TEST_F(GLES2DecoderTest, CopyTexSubImage2DClearsUnclearedTexture) { |
TEST_F(GLES2DecoderManualInitTest, CompressedImage2DMarksTextureAsCleared) { |
InitDecoder( |
"GL_EXT_texture_compression_s3tc", // extensions |
+ "3.0", // gl version |
false, // has alpha |
false, // has depth |
false, // has stencil |
@@ -6687,6 +6741,7 @@ TEST_F(GLES2DecoderManualInitTest, |
UnClearedAttachmentsGetClearedOnReadPixelsAndDrawBufferGetsRestored) { |
InitDecoder( |
"GL_EXT_framebuffer_multisample", // extensions |
+ "2.1", // gl version |
false, // has alpha |
false, // has depth |
false, // has stencil |
@@ -7139,6 +7194,7 @@ TEST_F(GLES2DecoderTest, BeginQueryEXTDisabled) { |
TEST_F(GLES2DecoderManualInitTest, BeginEndQueryEXT) { |
InitDecoder( |
"GL_EXT_occlusion_query_boolean", // extensions |
+ "opengl es 2.0", // gl version |
true, // has alpha |
false, // has depth |
false, // has stencil |
@@ -7261,6 +7317,7 @@ static void CheckBeginEndQueryBadMemoryFails( |
TEST_F(GLES2DecoderManualInitTest, BeginEndQueryEXTBadMemoryIdFails) { |
InitDecoder( |
"GL_EXT_occlusion_query_boolean", // extensions |
+ "opengl es 2.0", // gl version |
true, // has alpha |
false, // has depth |
false, // has stencil |
@@ -7277,6 +7334,7 @@ TEST_F(GLES2DecoderManualInitTest, BeginEndQueryEXTBadMemoryIdFails) { |
TEST_F(GLES2DecoderManualInitTest, BeginEndQueryEXTBadMemoryOffsetFails) { |
InitDecoder( |
"GL_EXT_occlusion_query_boolean", // extensions |
+ "opengl es 2.0", // gl version |
true, // has alpha |
false, // has depth |
false, // has stencil |
@@ -7474,6 +7532,7 @@ TEST_F(GLES2DecoderTest, IsEnabledReturnsCachedValue) { |
TEST_F(GLES2DecoderManualInitTest, DepthTextureBadArgs) { |
InitDecoder( |
"GL_ANGLE_depth_texture", // extensions |
+ "opengl es 2.0", // gl version |
false, // has alpha |
true, // has depth |
true, // has stencil |
@@ -7526,6 +7585,7 @@ TEST_F(GLES2DecoderManualInitTest, DepthTextureBadArgs) { |
TEST_F(GLES2DecoderManualInitTest, GenerateMipmapDepthTexture) { |
InitDecoder( |
"GL_ANGLE_depth_texture", // extensions |
+ "opengl es 2.0", // gl version |
false, // has alpha |
true, // has depth |
true, // has stencil |
@@ -7546,6 +7606,7 @@ TEST_F(GLES2DecoderManualInitTest, GenerateMipmapDepthTexture) { |
TEST_F(GLES2DecoderManualInitTest, DrawClearsDepthTexture) { |
InitDecoder( |
"GL_ANGLE_depth_texture", // extensions |
+ "opengl es 2.0", // gl version |
true, // has alpha |
true, // has depth |
false, // has stencil |
@@ -7677,6 +7738,7 @@ class GLES2DecoderVertexArraysOESTest : public GLES2DecoderWithShaderTest { |
virtual void SetUp() { |
InitDecoder( |
"GL_OES_vertex_array_object", // extensions |
+ "opengl es 2.0", // gl version |
false, // has alpha |
false, // has depth |
false, // has stencil |
@@ -7827,6 +7889,7 @@ class GLES2DecoderEmulatedVertexArraysOESTest |
virtual void SetUp() { |
InitDecoder( |
"", // extensions |
+ "3.0", // gl version |
false, // has alpha |
false, // has depth |
false, // has stencil |
@@ -8183,6 +8246,7 @@ TEST_F(GLES2DecoderWithShaderTest, UseTexImage) { |
TEST_F(GLES2DecoderManualInitTest, GpuMemoryManagerCHROMIUM) { |
InitDecoder( |
"GL_ARB_texture_rectangle", // extensions |
+ "3.0", // gl version |
false, // has alpha |
false, // has depth |
false, // has stencil |
@@ -8223,6 +8287,7 @@ TEST_F(GLES2DecoderManualInitTest, GpuMemoryManagerCHROMIUM) { |
TEST_F(GLES2DecoderManualInitTest, AsyncPixelTransfers) { |
InitDecoder( |
"GL_CHROMIUM_async_pixel_transfers", // extensions |
+ "3.0", // gl version |
false, false, false, // has alpha/depth/stencil |
false, false, false, // request alpha/depth/stencil |
true); // bind generates resource |
@@ -8413,6 +8478,7 @@ TEST_F(GLES2DecoderManualInitTest, AsyncPixelTransfers) { |
TEST_F(GLES2DecoderManualInitTest, AsyncPixelTransferManager) { |
InitDecoder( |
"GL_CHROMIUM_async_pixel_transfers", // extensions |
+ "3.0", // gl version |
false, false, false, // has alpha/depth/stencil |
false, false, false, // request alpha/depth/stencil |
true); // bind generates resource |
@@ -8516,6 +8582,7 @@ TEST_F(GLES2DecoderManualInitTest, MemoryTrackerInitialSize) { |
set_memory_tracker(memory_tracker.get()); |
InitDecoder( |
"", // extensions |
+ "3.0", // gl version |
false, // has alpha |
false, // has depth |
false, // has stencil |
@@ -8534,6 +8601,7 @@ TEST_F(GLES2DecoderManualInitTest, MemoryTrackerTexImage2D) { |
set_memory_tracker(memory_tracker.get()); |
InitDecoder( |
"", // extensions |
+ "3.0", // gl version |
false, // has alpha |
false, // has depth |
false, // has stencil |
@@ -8570,6 +8638,7 @@ TEST_F(GLES2DecoderManualInitTest, MemoryTrackerTexStorage2DEXT) { |
set_memory_tracker(memory_tracker.get()); |
InitDecoder( |
"", // extensions |
+ "3.0", // gl version |
false, // has alpha |
false, // has depth |
false, // has stencil |
@@ -8601,6 +8670,7 @@ TEST_F(GLES2DecoderManualInitTest, MemoryTrackerCopyTexImage2D) { |
set_memory_tracker(memory_tracker.get()); |
InitDecoder( |
"", // extensions |
+ "3.0", // gl version |
true, // has alpha |
false, // has depth |
false, // has stencil |
@@ -8638,6 +8708,7 @@ TEST_F(GLES2DecoderManualInitTest, MemoryTrackerRenderbufferStorage) { |
set_memory_tracker(memory_tracker.get()); |
InitDecoder( |
"", // extensions |
+ "3.0", // gl version |
false, // has alpha |
false, // has depth |
false, // has stencil |
@@ -8677,6 +8748,7 @@ TEST_F(GLES2DecoderManualInitTest, MemoryTrackerBufferData) { |
set_memory_tracker(memory_tracker.get()); |
InitDecoder( |
"", // extensions |
+ "3.0", // gl version |
false, // has alpha |
false, // has depth |
false, // has stencil |
@@ -8766,6 +8838,7 @@ TEST_F(GLES2DecoderTest, DrawBuffersEXTImmediateBackbuffer) { |
TEST_F(GLES2DecoderManualInitTest, DiscardFramebufferEXT) { |
InitDecoder("GL_EXT_discard_framebuffer", // extensions |
+ "opengl es 2.0", // gl version |
false, // has alpha |
false, // has depth |
false, // has stencil |