Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(192)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc

Issue 289993002: Remove shm versions of immediate commands from command buffer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@functions-with-extension-flag
Patch Set: try to avoid compiler warning on buffer overflow and template specialization linker problem with tw… Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h ('k') | gpu/command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc
index a16b2980f1834e30bd2befc4dc6980dbf8a31cda..de52efe090264ada2ab7e5a3c0e3191f3a5f1021 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc
@@ -61,9 +61,11 @@ class GLES2DecoderTest2 : public GLES2DecoderTestBase {
{
valid_uniform = accepts_apis & Program::kUniform1i;
- cmds::Uniform1iv cmd;
- cmd.Init(1, 2, shared_memory_id_, shared_memory_offset_);
- EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
+ cmds::Uniform1ivImmediate& cmd =
+ *GetImmediateAs<cmds::Uniform1ivImmediate>();
+ GLint data[2][1] = {{0}};
+ cmd.Init(1, 2, &data[0][0]);
+ EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(data)));
EXPECT_EQ(valid_uniform ? GL_NO_ERROR : GL_INVALID_OPERATION,
GetGLError());
}
@@ -79,9 +81,11 @@ class GLES2DecoderTest2 : public GLES2DecoderTestBase {
{
valid_uniform = accepts_apis & Program::kUniform2i;
- cmds::Uniform2iv cmd;
- cmd.Init(1, 2, shared_memory_id_, shared_memory_offset_);
- EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
+ cmds::Uniform2ivImmediate& cmd =
+ *GetImmediateAs<cmds::Uniform2ivImmediate>();
+ GLint data[2][2] = {{0}};
+ cmd.Init(1, 2, &data[0][0]);
+ EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(data)));
EXPECT_EQ(valid_uniform ? GL_NO_ERROR : GL_INVALID_OPERATION,
GetGLError());
}
@@ -97,9 +101,11 @@ class GLES2DecoderTest2 : public GLES2DecoderTestBase {
{
valid_uniform = accepts_apis & Program::kUniform3i;
- cmds::Uniform3iv cmd;
- cmd.Init(1, 2, shared_memory_id_, shared_memory_offset_);
- EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
+ cmds::Uniform3ivImmediate& cmd =
+ *GetImmediateAs<cmds::Uniform3ivImmediate>();
+ GLint data[2][3] = {{0}};
+ cmd.Init(1, 2, &data[0][0]);
+ EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(data)));
EXPECT_EQ(valid_uniform ? GL_NO_ERROR : GL_INVALID_OPERATION,
GetGLError());
}
@@ -115,9 +121,11 @@ class GLES2DecoderTest2 : public GLES2DecoderTestBase {
{
valid_uniform = accepts_apis & Program::kUniform4i;
- cmds::Uniform4iv cmd;
- cmd.Init(1, 2, shared_memory_id_, shared_memory_offset_);
- EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
+ cmds::Uniform4ivImmediate& cmd =
+ *GetImmediateAs<cmds::Uniform4ivImmediate>();
+ GLint data[2][4] = {{0}};
+ cmd.Init(1, 2, &data[0][0]);
+ EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(data)));
EXPECT_EQ(valid_uniform ? GL_NO_ERROR : GL_INVALID_OPERATION,
GetGLError());
}
@@ -135,9 +143,11 @@ class GLES2DecoderTest2 : public GLES2DecoderTestBase {
{
valid_uniform = accepts_apis & Program::kUniform1f;
- cmds::Uniform1fv cmd;
- cmd.Init(1, 2, shared_memory_id_, shared_memory_offset_);
- EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
+ cmds::Uniform1fvImmediate& cmd =
+ *GetImmediateAs<cmds::Uniform1fvImmediate>();
+ GLfloat data[2][1] = {{0.0f}};
+ cmd.Init(1, 2, &data[0][0]);
+ EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(data)));
EXPECT_EQ(valid_uniform ? GL_NO_ERROR : GL_INVALID_OPERATION,
GetGLError());
}
@@ -153,9 +163,11 @@ class GLES2DecoderTest2 : public GLES2DecoderTestBase {
{
valid_uniform = accepts_apis & Program::kUniform2f;
- cmds::Uniform2fv cmd;
- cmd.Init(1, 2, shared_memory_id_, shared_memory_offset_);
- EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
+ cmds::Uniform2fvImmediate& cmd =
+ *GetImmediateAs<cmds::Uniform2fvImmediate>();
+ GLfloat data[2][2] = {{0.0f}};
+ cmd.Init(1, 2, &data[0][0]);
+ EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(data)));
EXPECT_EQ(valid_uniform ? GL_NO_ERROR : GL_INVALID_OPERATION,
GetGLError());
}
@@ -171,9 +183,11 @@ class GLES2DecoderTest2 : public GLES2DecoderTestBase {
{
valid_uniform = accepts_apis & Program::kUniform3f;
- cmds::Uniform3fv cmd;
- cmd.Init(1, 2, shared_memory_id_, shared_memory_offset_);
- EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
+ cmds::Uniform3fvImmediate& cmd =
+ *GetImmediateAs<cmds::Uniform3fvImmediate>();
+ GLfloat data[2][3] = {{0.0f}};
+ cmd.Init(1, 2, &data[0][0]);
+ EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(data)));
EXPECT_EQ(valid_uniform ? GL_NO_ERROR : GL_INVALID_OPERATION,
GetGLError());
}
@@ -189,36 +203,45 @@ class GLES2DecoderTest2 : public GLES2DecoderTestBase {
{
valid_uniform = accepts_apis & Program::kUniform4f;
- cmds::Uniform4fv cmd;
- cmd.Init(1, 2, shared_memory_id_, shared_memory_offset_);
- EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
+ cmds::Uniform4fvImmediate& cmd =
+ *GetImmediateAs<cmds::Uniform4fvImmediate>();
+ GLfloat data[2][4] = {{0.0f}};
+ cmd.Init(1, 2, &data[0][0]);
+ EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(data)));
EXPECT_EQ(valid_uniform ? GL_NO_ERROR : GL_INVALID_OPERATION,
GetGLError());
}
{
valid_uniform = accepts_apis & Program::kUniformMatrix2f;
- cmds::UniformMatrix2fv cmd;
- cmd.Init(1, 2, shared_memory_id_, shared_memory_offset_);
- EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
+ cmds::UniformMatrix2fvImmediate& cmd =
+ *GetImmediateAs<cmds::UniformMatrix2fvImmediate>();
+ GLfloat data[2][2 * 2] = {{0.0f}};
+
+ cmd.Init(1, 2, &data[0][0]);
+ EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(data)));
EXPECT_EQ(valid_uniform ? GL_NO_ERROR : GL_INVALID_OPERATION,
GetGLError());
}
{
valid_uniform = accepts_apis & Program::kUniformMatrix3f;
- cmds::UniformMatrix3fv cmd;
- cmd.Init(1, 2, shared_memory_id_, shared_memory_offset_);
- EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
+ cmds::UniformMatrix3fvImmediate& cmd =
+ *GetImmediateAs<cmds::UniformMatrix3fvImmediate>();
+ GLfloat data[2][3 * 3] = {{0.0f}};
+ cmd.Init(1, 2, &data[0][0]);
+ EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(data)));
EXPECT_EQ(valid_uniform ? GL_NO_ERROR : GL_INVALID_OPERATION,
GetGLError());
}
{
valid_uniform = accepts_apis & Program::kUniformMatrix4f;
- cmds::UniformMatrix4fv cmd;
- cmd.Init(1, 2, shared_memory_id_, shared_memory_offset_);
- EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
+ cmds::UniformMatrix4fvImmediate& cmd =
+ *GetImmediateAs<cmds::UniformMatrix4fvImmediate>();
+ GLfloat data[2][4 * 4] = {{0.0f}};
+ cmd.Init(1, 2, &data[0][0]);
+ EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(data)));
EXPECT_EQ(valid_uniform ? GL_NO_ERROR : GL_INVALID_OPERATION,
GetGLError());
}
@@ -228,40 +251,16 @@ class GLES2DecoderTest2 : public GLES2DecoderTestBase {
INSTANTIATE_TEST_CASE_P(Service, GLES2DecoderTest2, ::testing::Bool());
template <>
-void GLES2DecoderTestBase::SpecializedSetup<cmds::GenQueriesEXT, 0>(
- bool valid) {
- if (!valid) {
- // Make the client_query_id_ so that trying to make it again
- // will fail.
- GetSharedMemoryAs<GLuint*>()[0] = client_query_id_;
- cmds::GenQueriesEXT cmd;
- cmd.Init(1, shared_memory_id_, shared_memory_offset_);
- EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
- }
-};
-
-template <>
void GLES2DecoderTestBase::SpecializedSetup<cmds::GenQueriesEXTImmediate, 0>(
bool valid) {
if (!valid) {
// Make the client_query_id_ so that trying to make it again
// will fail.
- GetSharedMemoryAs<GLuint*>()[0] = client_query_id_;
- cmds::GenQueriesEXT cmd;
- cmd.Init(1, shared_memory_id_, shared_memory_offset_);
- EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
- }
-};
-
-template <>
-void GLES2DecoderTestBase::SpecializedSetup<cmds::DeleteQueriesEXT, 0>(
- bool valid) {
- if (valid) {
- // Make the client_query_id_ so that trying to delete it will succeed.
- GetSharedMemoryAs<GLuint*>()[0] = client_query_id_;
- cmds::GenQueriesEXT cmd;
- cmd.Init(1, shared_memory_id_, shared_memory_offset_);
- EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
+ cmds::GenQueriesEXTImmediate& cmd =
+ *GetImmediateAs<cmds::GenQueriesEXTImmediate>();
+ cmd.Init(1, &client_query_id_);
+ EXPECT_EQ(error::kNoError,
+ ExecuteImmediateCmd(cmd, sizeof(client_query_id_)));
}
};
@@ -270,10 +269,11 @@ void GLES2DecoderTestBase::SpecializedSetup<cmds::DeleteQueriesEXTImmediate, 0>(
bool valid) {
if (valid) {
// Make the client_query_id_ so that trying to delete it will succeed.
- GetSharedMemoryAs<GLuint*>()[0] = client_query_id_;
- cmds::GenQueriesEXT cmd;
- cmd.Init(1, shared_memory_id_, shared_memory_offset_);
- EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
+ cmds::GenQueriesEXTImmediate& cmd =
+ *GetImmediateAs<cmds::GenQueriesEXTImmediate>();
+ cmd.Init(1, &client_query_id_);
+ EXPECT_EQ(error::kNoError,
+ ExecuteImmediateCmd(cmd, sizeof(client_query_id_)));
}
};
@@ -370,24 +370,12 @@ void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform1f, 0>(
};
template <>
-void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform1fv, 0>(
- bool /* valid */) {
- SetupShaderForUniform(GL_FLOAT);
-};
-
-template <>
void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform1fvImmediate, 0>(
bool /* valid */) {
SetupShaderForUniform(GL_FLOAT);
};
template <>
-void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform1iv, 0>(
- bool /* valid */) {
- SetupShaderForUniform(GL_INT);
-};
-
-template <>
void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform1ivImmediate, 0>(
bool /* valid */) {
SetupShaderForUniform(GL_INT);
@@ -406,18 +394,6 @@ void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform2i, 0>(
};
template <>
-void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform2fv, 0>(
- bool /* valid */) {
- SetupShaderForUniform(GL_FLOAT_VEC2);
-};
-
-template <>
-void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform2iv, 0>(
- bool /* valid */) {
- SetupShaderForUniform(GL_INT_VEC2);
-};
-
-template <>
void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform2fvImmediate, 0>(
bool /* valid */) {
SetupShaderForUniform(GL_FLOAT_VEC2);
@@ -442,18 +418,6 @@ void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform3i, 0>(
};
template <>
-void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform3fv, 0>(
- bool /* valid */) {
- SetupShaderForUniform(GL_FLOAT_VEC3);
-};
-
-template <>
-void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform3iv, 0>(
- bool /* valid */) {
- SetupShaderForUniform(GL_INT_VEC3);
-};
-
-template <>
void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform3fvImmediate, 0>(
bool /* valid */) {
SetupShaderForUniform(GL_FLOAT_VEC3);
@@ -478,18 +442,6 @@ void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform4i, 0>(
};
template <>
-void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform4fv, 0>(
- bool /* valid */) {
- SetupShaderForUniform(GL_FLOAT_VEC4);
-};
-
-template <>
-void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform4iv, 0>(
- bool /* valid */) {
- SetupShaderForUniform(GL_INT_VEC4);
-};
-
-template <>
void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform4fvImmediate, 0>(
bool /* valid */) {
SetupShaderForUniform(GL_FLOAT_VEC4);
@@ -502,36 +454,18 @@ void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform4ivImmediate, 0>(
};
template <>
-void GLES2DecoderTestBase::SpecializedSetup<cmds::UniformMatrix2fv, 0>(
- bool /* valid */) {
- SetupShaderForUniform(GL_FLOAT_MAT2);
-};
-
-template <>
void GLES2DecoderTestBase::SpecializedSetup<cmds::UniformMatrix2fvImmediate, 0>(
bool /* valid */) {
SetupShaderForUniform(GL_FLOAT_MAT2);
};
template <>
-void GLES2DecoderTestBase::SpecializedSetup<cmds::UniformMatrix3fv, 0>(
- bool /* valid */) {
- SetupShaderForUniform(GL_FLOAT_MAT3);
-};
-
-template <>
void GLES2DecoderTestBase::SpecializedSetup<cmds::UniformMatrix3fvImmediate, 0>(
bool /* valid */) {
SetupShaderForUniform(GL_FLOAT_MAT3);
};
template <>
-void GLES2DecoderTestBase::SpecializedSetup<cmds::UniformMatrix4fv, 0>(
- bool /* valid */) {
- SetupShaderForUniform(GL_FLOAT_MAT4);
-};
-
-template <>
void GLES2DecoderTestBase::SpecializedSetup<cmds::UniformMatrix4fvImmediate, 0>(
bool /* valid */) {
SetupShaderForUniform(GL_FLOAT_MAT4);
@@ -569,24 +503,12 @@ void GLES2DecoderTestBase::SpecializedSetup<cmds::TexParameteri, 0>(
};
template <>
-void GLES2DecoderTestBase::SpecializedSetup<cmds::TexParameterfv, 0>(
- bool /* valid */) {
- DoBindTexture(GL_TEXTURE_2D, client_texture_id_, kServiceTextureId);
-};
-
-template <>
void GLES2DecoderTestBase::SpecializedSetup<cmds::TexParameterfvImmediate, 0>(
bool /* valid */) {
DoBindTexture(GL_TEXTURE_2D, client_texture_id_, kServiceTextureId);
};
template <>
-void GLES2DecoderTestBase::SpecializedSetup<cmds::TexParameteriv, 0>(
- bool /* valid */) {
- DoBindTexture(GL_TEXTURE_2D, client_texture_id_, kServiceTextureId);
-};
-
-template <>
void GLES2DecoderTestBase::SpecializedSetup<cmds::TexParameterivImmediate, 0>(
bool /* valid */) {
DoBindTexture(GL_TEXTURE_2D, client_texture_id_, kServiceTextureId);
« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h ('k') | gpu/command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698