diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-04 14:17:57 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-05 10:05:06 +0000 |
commit | 39d357e3248f80abea0159765ff39554affb40db (patch) | |
tree | aba0e6bfb76de0244bba0f5fdbd64b830dd6e621 /chromium/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h | |
parent | 87778abf5a1f89266f37d1321b92a21851d8244d (diff) | |
download | qtwebengine-chromium-39d357e3248f80abea0159765ff39554affb40db.tar.gz |
BASELINE: Update Chromium to 55.0.2883.105
And updates ninja to 1.7.2
Change-Id: I20d43c737f82764d857ada9a55586901b18b9243
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h')
-rw-r--r-- | chromium/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/chromium/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h b/chromium/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h index a852521c695..992ffdea66d 100644 --- a/chromium/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h +++ b/chromium/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h @@ -70,11 +70,6 @@ class GLES2DecoderTestBase : public ::testing::TestWithParam<bool> { return reinterpret_cast<T*>(immediate_buffer_); } - template <typename T, typename Command> - T GetImmediateDataAs(Command* cmd) { - return reinterpret_cast<T>(ImmediateDataAddress(cmd)); - } - void ClearSharedMemory() { engine_->ClearSharedMemory(); } @@ -348,6 +343,7 @@ class GLES2DecoderTestBase : public ::testing::TestWithParam<bool> { GLenum target, GLenum attachment, GLenum tex_target, GLuint texture_client_id, GLuint texture_service_id, GLint level, GLenum error); + GLenum DoCheckFramebufferStatus(GLenum target); void DoVertexAttribPointer( GLuint index, GLint size, GLenum type, GLsizei stride, GLuint offset); void DoVertexAttribDivisorANGLE(GLuint index, GLuint divisor); @@ -572,6 +568,7 @@ class GLES2DecoderTestBase : public ::testing::TestWithParam<bool> { static const char* kUniform5Name; static const char* kUniform6Name; static const char* kUniform7Name; + static const char* kUniform8Name; static const GLint kUniform1Size = 1; static const GLint kUniform2Size = 3; static const GLint kUniform3Size = 2; @@ -579,6 +576,7 @@ class GLES2DecoderTestBase : public ::testing::TestWithParam<bool> { static const GLint kUniform5Size = 1; static const GLint kUniform6Size = 1; static const GLint kUniform7Size = 1; + static const GLint kUniform8Size = 2; static const GLint kUniform1RealLocation = 3; static const GLint kUniform2RealLocation = 10; static const GLint kUniform2ElementRealLocation = 12; @@ -587,6 +585,7 @@ class GLES2DecoderTestBase : public ::testing::TestWithParam<bool> { static const GLint kUniform5RealLocation = 30; static const GLint kUniform6RealLocation = 32; static const GLint kUniform7RealLocation = 44; + static const GLint kUniform8RealLocation = 56; static const GLint kUniform1FakeLocation = 0; // These are static const GLint kUniform2FakeLocation = 1; // hardcoded static const GLint kUniform2ElementFakeLocation = 0x10001; // to match @@ -595,6 +594,7 @@ class GLES2DecoderTestBase : public ::testing::TestWithParam<bool> { static const GLint kUniform5FakeLocation = 4; // static const GLint kUniform6FakeLocation = 5; // static const GLint kUniform7FakeLocation = 6; // + static const GLint kUniform8FakeLocation = 7; // static const GLint kUniform1DesiredLocation = -1; static const GLint kUniform2DesiredLocation = -1; static const GLint kUniform3DesiredLocation = -1; @@ -602,6 +602,7 @@ class GLES2DecoderTestBase : public ::testing::TestWithParam<bool> { static const GLint kUniform5DesiredLocation = -1; static const GLint kUniform6DesiredLocation = -1; static const GLint kUniform7DesiredLocation = -1; + static const GLint kUniform8DesiredLocation = -1; static const GLenum kUniform1Type = GL_SAMPLER_2D; static const GLenum kUniform2Type = GL_INT_VEC2; static const GLenum kUniform3Type = GL_FLOAT_VEC3; @@ -609,6 +610,7 @@ class GLES2DecoderTestBase : public ::testing::TestWithParam<bool> { static const GLenum kUniform5Type = GL_UNSIGNED_INT_VEC2; static const GLenum kUniform6Type = GL_UNSIGNED_INT_VEC3; static const GLenum kUniform7Type = GL_UNSIGNED_INT_VEC4; + static const GLenum kUniform8Type = GL_INT; static const GLenum kUniformSamplerExternalType = GL_SAMPLER_EXTERNAL_OES; static const GLenum kUniformCubemapType = GL_SAMPLER_CUBE; static const GLint kInvalidUniformLocation = 30; @@ -770,6 +772,14 @@ class GLES2DecoderWithShaderTestBase : public GLES2DecoderTestBase { template <> void GLES2DecoderTestBase::SpecializedSetup<cmds::LinkProgram, 0>(bool valid); +MATCHER_P2(PointsToArray, array, size, "") { + for (size_t i = 0; i < static_cast<size_t>(size); ++i) { + if (arg[i] != array[i]) + return false; + } + return true; +} + } // namespace gles2 } // namespace gpu |