Validate uniform types

Prevents the command buffer from calling glUniformXXX
if the type to be set is not the write type for the specific
glUniform call.

BUG=164337


Review URL: https://chromiumcodereview.appspot.com/11445013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171502 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 194 insertions, 46 deletions

diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index 515474d..bcdba58 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -492,6 +492,12 @@ class GLES2DecoderImpl : public GLES2Decoder {
  public:
   static const int kMaxLogMessages = 256;
 
+  // Used by PrepForSetUniformByLocation to validate types.
+  struct BaseUniformInfo {
+    const GLenum* const valid_types;
+    size_t num_valid_types;
+  };
+
   explicit GLES2DecoderImpl(ContextGroup* group);
   virtual ~GLES2DecoderImpl();
 
@@ -977,6 +983,7 @@ class GLES2DecoderImpl : public GLES2Decoder {
   // does not overflow the uniform.
   bool PrepForSetUniformByLocation(
       GLint fake_location, const char* function_name,
+      const BaseUniformInfo& base_info,
       GLint* real_location, GLenum* type, GLsizei* count);
 
   // Gets the service id for any simulated backbuffer fbo.
@@ -4755,12 +4762,129 @@ bool GLES2DecoderImpl::CheckCurrentProgramForUniform(
   return location != -1;
 }
 
+namespace {
+
+static const GLenum valid_int_vec1_types_list[] = {
+  GL_INT,
+  GL_BOOL,
+  GL_SAMPLER_2D,
+  GL_SAMPLER_2D_RECT_ARB,
+  GL_SAMPLER_CUBE,
+  GL_SAMPLER_EXTERNAL_OES,
+};
+
+static const GLenum valid_int_vec2_types_list[] = {
+  GL_INT_VEC2,
+  GL_BOOL_VEC2,
+};
+
+static const GLenum valid_int_vec3_types_list[] = {
+  GL_INT_VEC3,
+  GL_BOOL_VEC3,
+};
+
+static const GLenum valid_int_vec4_types_list[] = {
+  GL_INT_VEC4,
+  GL_BOOL_VEC4,
+};
+
+static const GLenum valid_float_vec1_types_list[] = {
+  GL_FLOAT,
+  GL_BOOL,
+};
+
+static const GLenum valid_float_vec2_types_list[] = {
+  GL_FLOAT_VEC2,
+  GL_BOOL_VEC2,
+};
+
+static const GLenum valid_float_vec3_types_list[] = {
+  GL_FLOAT_VEC3,
+  GL_BOOL_VEC3,
+};
+
+static const GLenum valid_float_vec4_types_list[] = {
+  GL_FLOAT_VEC4,
+  GL_BOOL_VEC4,
+};
+
+static const GLenum valid_float_mat2_types_list[] = {
+  GL_FLOAT_MAT2,
+};
+
+static const GLenum valid_float_mat3_types_list[] = {
+  GL_FLOAT_MAT3,
+};
+
+static const GLenum valid_float_mat4_types_list[] = {
+  GL_FLOAT_MAT4,
+};
+
+static const GLES2DecoderImpl::BaseUniformInfo valid_int_vec1_base_info = {
+  valid_int_vec1_types_list,
+  arraysize(valid_int_vec1_types_list),
+};
+
+static const GLES2DecoderImpl::BaseUniformInfo valid_int_vec2_base_info = {
+  valid_int_vec2_types_list,
+  arraysize(valid_int_vec2_types_list),
+};
+
+static const GLES2DecoderImpl::BaseUniformInfo valid_int_vec3_base_info = {
+  valid_int_vec3_types_list,
+  arraysize(valid_int_vec3_types_list),
+};
+
+static const GLES2DecoderImpl::BaseUniformInfo valid_int_vec4_base_info = {
+  valid_int_vec4_types_list,
+  arraysize(valid_int_vec4_types_list),
+};
+
+static const GLES2DecoderImpl::BaseUniformInfo valid_float_vec1_base_info = {
+  valid_float_vec1_types_list,
+  arraysize(valid_float_vec1_types_list),
+};
+
+static const GLES2DecoderImpl::BaseUniformInfo valid_float_vec2_base_info = {
+  valid_float_vec2_types_list,
+  arraysize(valid_float_vec2_types_list),
+};
+
+static const GLES2DecoderImpl::BaseUniformInfo valid_float_vec3_base_info = {
+  valid_float_vec3_types_list,
+  arraysize(valid_float_vec3_types_list),
+};
+
+static const GLES2DecoderImpl::BaseUniformInfo valid_float_vec4_base_info = {
+  valid_float_vec4_types_list,
+  arraysize(valid_float_vec4_types_list),
+};
+
+static const GLES2DecoderImpl::BaseUniformInfo valid_float_mat2_base_info = {
+  valid_float_mat2_types_list,
+  arraysize(valid_float_mat2_types_list),
+};
+
+static const GLES2DecoderImpl::BaseUniformInfo valid_float_mat3_base_info = {
+  valid_float_mat3_types_list,
+  arraysize(valid_float_mat3_types_list),
+};
+
+static const GLES2DecoderImpl::BaseUniformInfo valid_float_mat4_base_info = {
+  valid_float_mat4_types_list,
+  arraysize(valid_float_mat4_types_list),
+};
+
+}  // anonymous namespace.
+
 bool GLES2DecoderImpl::PrepForSetUniformByLocation(
     GLint fake_location, const char* function_name,
+    const GLES2DecoderImpl::BaseUniformInfo& base_info,
     GLint* real_location, GLenum* type, GLsizei* count) {
   DCHECK(type);
   DCHECK(count);
   DCHECK(real_location);
+
   if (!CheckCurrentProgramForUniform(fake_location, function_name)) {
     return false;
   }
@@ -4772,6 +4896,18 @@ bool GLES2DecoderImpl::PrepForSetUniformByLocation(
     SetGLError(GL_INVALID_OPERATION, function_name, "unknown location");
     return false;
   }
+  bool okay = false;
+  for (size_t ii = 0; ii < base_info.num_valid_types; ++ii) {
+    if (base_info.valid_types[ii] == info->type) {
+      okay = true;
+      break;
+    }
+  }
+  if (!okay) {
+    SetGLError(
+        GL_INVALID_OPERATION, function_name, "wrong uniform function for type");
+    return false;
+  }
   if (*count > 1 && !info->is_array) {
     SetGLError(
         GL_INVALID_OPERATION, function_name, "count > 1 for non-array");
@@ -4790,7 +4926,8 @@ void GLES2DecoderImpl::DoUniform1i(GLint fake_location, GLint v0) {
   GLsizei count = 1;
   GLint real_location = -1;
   if (!PrepForSetUniformByLocation(
-      fake_location, "glUniform1iv", &real_location, &type, &count)) {
+      fake_location, "glUniform1iv", valid_int_vec1_base_info,
+      &real_location, &type, &count)) {
     return;
   }
   if (!state_.current_program->SetSamplers(
@@ -4806,7 +4943,8 @@ void GLES2DecoderImpl::DoUniform1iv(
   GLenum type = 0;
   GLint real_location = -1;
   if (!PrepForSetUniformByLocation(
-      fake_location, "glUniform1iv", &real_location, &type, &count)) {
+      fake_location, "glUniform1iv", valid_int_vec1_base_info,
+      &real_location, &type, &count)) {
     return;
   }
   if (type == GL_SAMPLER_2D || type == GL_SAMPLER_2D_RECT_ARB ||
@@ -4825,7 +4963,8 @@ void GLES2DecoderImpl::DoUniform1fv(
   GLenum type = 0;
   GLint real_location = -1;
   if (!PrepForSetUniformByLocation(
-      fake_location, "glUniform1fv", &real_location, &type, &count)) {
+      fake_location, "glUniform1fv", valid_float_vec1_base_info,
+      &real_location, &type, &count)) {
     return;
   }
   if (type == GL_BOOL) {
@@ -4844,7 +4983,8 @@ void GLES2DecoderImpl::DoUniform2fv(
   GLenum type = 0;
   GLint real_location = -1;
   if (!PrepForSetUniformByLocation(
-      fake_location, "glUniform2fv", &real_location, &type, &count)) {
+      fake_location, "glUniform2fv", valid_float_vec2_base_info,
+      &real_location, &type, &count)) {
     return;
   }
   if (type == GL_BOOL_VEC2) {
@@ -4864,7 +5004,8 @@ void GLES2DecoderImpl::DoUniform3fv(
   GLenum type = 0;
   GLint real_location = -1;
   if (!PrepForSetUniformByLocation(
-      fake_location, "glUniform3fv", &real_location, &type, &count)) {
+      fake_location, "glUniform3fv", valid_float_vec3_base_info,
+      &real_location, &type, &count)) {
     return;
   }
   if (type == GL_BOOL_VEC3) {
@@ -4884,7 +5025,8 @@ void GLES2DecoderImpl::DoUniform4fv(
   GLenum type = 0;
   GLint real_location = -1;
   if (!PrepForSetUniformByLocation(
-      fake_location, "glUniform4fv", &real_location, &type, &count)) {
+      fake_location, "glUniform4fv", valid_float_vec4_base_info,
+      &real_location, &type, &count)) {
     return;
   }
   if (type == GL_BOOL_VEC4) {
@@ -4904,7 +5046,8 @@ void GLES2DecoderImpl::DoUniform2iv(
   GLenum type = 0;
   GLint real_location = -1;
   if (!PrepForSetUniformByLocation(
-      fake_location, "glUniform2iv", &real_location, &type, &count)) {
+      fake_location, "glUniform2iv", valid_int_vec2_base_info,
+      &real_location, &type, &count)) {
     return;
   }
   glUniform2iv(real_location, count, value);
@@ -4915,7 +5058,8 @@ void GLES2DecoderImpl::DoUniform3iv(
   GLenum type = 0;
   GLint real_location = -1;
   if (!PrepForSetUniformByLocation(
-      fake_location, "glUniform3iv", &real_location, &type, &count)) {
+      fake_location, "glUniform3iv", valid_int_vec3_base_info,
+      &real_location, &type, &count)) {
     return;
   }
   glUniform3iv(real_location, count, value);
@@ -4926,7 +5070,8 @@ void GLES2DecoderImpl::DoUniform4iv(
   GLenum type = 0;
   GLint real_location = -1;
   if (!PrepForSetUniformByLocation(
-      fake_location, "glUniform4iv", &real_location, &type, &count)) {
+      fake_location, "glUniform4iv", valid_int_vec4_base_info,
+      &real_location, &type, &count)) {
     return;
   }
   glUniform4iv(real_location, count, value);
@@ -4938,7 +5083,8 @@ void GLES2DecoderImpl::DoUniformMatrix2fv(
   GLenum type = 0;
   GLint real_location = -1;
   if (!PrepForSetUniformByLocation(
-      fake_location, "glUniformMatrix2fv", &real_location, &type, &count)) {
+      fake_location, "glUniformMatrix2fv", valid_float_mat2_base_info,
+      &real_location, &type, &count)) {
     return;
   }
   glUniformMatrix2fv(real_location, count, transpose, value);
@@ -4950,7 +5096,8 @@ void GLES2DecoderImpl::DoUniformMatrix3fv(
   GLenum type = 0;
   GLint real_location = -1;
   if (!PrepForSetUniformByLocation(
-      fake_location, "glUniformMatrix3fv", &real_location, &type, &count)) {
+      fake_location, "glUniformMatrix3fv",  valid_float_mat3_base_info,
+      &real_location, &type, &count)) {
     return;
   }
   glUniformMatrix3fv(real_location, count, transpose, value);
@@ -4962,7 +5109,8 @@ void GLES2DecoderImpl::DoUniformMatrix4fv(
   GLenum type = 0;
   GLint real_location = -1;
   if (!PrepForSetUniformByLocation(
-      fake_location, "glUniformMatrix4fv", &real_location, &type, &count)) {
+      fake_location, "glUniformMatrix4fv",  valid_float_mat4_base_info,
+      &real_location, &type, &count)) {
     return;
   }
   glUniformMatrix4fv(real_location, count, transpose, value);
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 d9adbfb..1803733 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc
@@ -154,161 +154,161 @@ void GLES2DecoderTestBase::SpecializedSetup<ValidateProgram, 0>(
 
 template <>
 void GLES2DecoderTestBase::SpecializedSetup<Uniform1f, 0>(bool /* valid */) {
-  SetupShaderForUniform();
+  SetupShaderForUniform(GL_FLOAT);
 };
 
 template <>
 void GLES2DecoderTestBase::SpecializedSetup<Uniform1fv, 0>(bool /* valid */) {
-  SetupShaderForUniform();
+  SetupShaderForUniform(GL_FLOAT);
 };
 
 template <>
 void GLES2DecoderTestBase::SpecializedSetup<Uniform1fvImmediate, 0>(
     bool /* valid */) {
-  SetupShaderForUniform();
+  SetupShaderForUniform(GL_FLOAT);
 };
 
 template <>
 void GLES2DecoderTestBase::SpecializedSetup<Uniform1iv, 0>(bool /* valid */) {
-  SetupShaderForUniform();
+  SetupShaderForUniform(GL_INT);
 };
 
 template <>
 void GLES2DecoderTestBase::SpecializedSetup<Uniform1ivImmediate, 0>(
     bool /* valid */) {
-  SetupShaderForUniform();
+  SetupShaderForUniform(GL_INT);
 };
 
 template <>
 void GLES2DecoderTestBase::SpecializedSetup<Uniform2f, 0>(bool /* valid */) {
-  SetupShaderForUniform();
+  SetupShaderForUniform(GL_FLOAT_VEC2);
 };
 
 template <>
 void GLES2DecoderTestBase::SpecializedSetup<Uniform2i, 0>(bool /* valid */) {
-  SetupShaderForUniform();
+  SetupShaderForUniform(GL_INT_VEC2);
 };
 
 template <>
 void GLES2DecoderTestBase::SpecializedSetup<Uniform2fv, 0>(bool /* valid */) {
-  SetupShaderForUniform();
+  SetupShaderForUniform(GL_FLOAT_VEC2);
 };
 
 template <>
 void GLES2DecoderTestBase::SpecializedSetup<Uniform2iv, 0>(bool /* valid */) {
-  SetupShaderForUniform();
+  SetupShaderForUniform(GL_INT_VEC2);
 };
 
 template <>
 void GLES2DecoderTestBase::SpecializedSetup<Uniform2fvImmediate, 0>(
     bool /* valid */) {
-  SetupShaderForUniform();
+  SetupShaderForUniform(GL_FLOAT_VEC2);
 };
 
 template <>
 void GLES2DecoderTestBase::SpecializedSetup<Uniform2ivImmediate, 0>(
     bool /* valid */) {
-  SetupShaderForUniform();
+  SetupShaderForUniform(GL_INT_VEC2);
 };
 
 template <>
 void GLES2DecoderTestBase::SpecializedSetup<Uniform3f, 0>(bool /* valid */) {
-  SetupShaderForUniform();
+  SetupShaderForUniform(GL_FLOAT_VEC3);
 };
 
 template <>
 void GLES2DecoderTestBase::SpecializedSetup<Uniform3i, 0>(bool /* valid */) {
-  SetupShaderForUniform();
+  SetupShaderForUniform(GL_INT_VEC3);
 };
 
 template <>
 void GLES2DecoderTestBase::SpecializedSetup<Uniform3fv, 0>(bool /* valid */) {
-  SetupShaderForUniform();
+  SetupShaderForUniform(GL_FLOAT_VEC3);
 };
 
 template <>
 void GLES2DecoderTestBase::SpecializedSetup<Uniform3iv, 0>(bool /* valid */) {
-  SetupShaderForUniform();
+  SetupShaderForUniform(GL_INT_VEC3);
 };
 
 template <>
 void GLES2DecoderTestBase::SpecializedSetup<Uniform3fvImmediate, 0>(
     bool /* valid */) {
-  SetupShaderForUniform();
+  SetupShaderForUniform(GL_FLOAT_VEC3);
 };
 
 template <>
 void GLES2DecoderTestBase::SpecializedSetup<Uniform3ivImmediate, 0>(
     bool /* valid */) {
-  SetupShaderForUniform();
+  SetupShaderForUniform(GL_INT_VEC3);
 };
 
 template <>
 void GLES2DecoderTestBase::SpecializedSetup<Uniform4f, 0>(bool /* valid */) {
-  SetupShaderForUniform();
+  SetupShaderForUniform(GL_FLOAT_VEC4);
 };
 
 template <>
 void GLES2DecoderTestBase::SpecializedSetup<Uniform4i, 0>(bool /* valid */) {
-  SetupShaderForUniform();
+  SetupShaderForUniform(GL_INT_VEC4);
 };
 
 template <>
 void GLES2DecoderTestBase::SpecializedSetup<Uniform4fv, 0>(bool /* valid */) {
-  SetupShaderForUniform();
+  SetupShaderForUniform(GL_FLOAT_VEC4);
 };
 
 template <>
 void GLES2DecoderTestBase::SpecializedSetup<Uniform4iv, 0>(bool /* valid */) {
-  SetupShaderForUniform();
+  SetupShaderForUniform(GL_INT_VEC4);
 };
 
 template <>
 void GLES2DecoderTestBase::SpecializedSetup<Uniform4fvImmediate, 0>(
     bool /* valid */) {
-  SetupShaderForUniform();
+  SetupShaderForUniform(GL_FLOAT_VEC4);
 };
 
 template <>
 void GLES2DecoderTestBase::SpecializedSetup<Uniform4ivImmediate, 0>(
     bool /* valid */) {
-  SetupShaderForUniform();
+  SetupShaderForUniform(GL_INT_VEC4);
 };
 
 template <>
 void GLES2DecoderTestBase::SpecializedSetup<UniformMatrix2fv, 0>(
     bool /* valid */) {
-  SetupShaderForUniform();
+  SetupShaderForUniform(GL_FLOAT_MAT2);
 };
 
 template <>
 void GLES2DecoderTestBase::SpecializedSetup<UniformMatrix2fvImmediate, 0>(
     bool /* valid */) {
-  SetupShaderForUniform();
+  SetupShaderForUniform(GL_FLOAT_MAT2);
 };
 
 template <>
 void GLES2DecoderTestBase::SpecializedSetup<UniformMatrix3fv, 0>(
     bool /* valid */) {
-  SetupShaderForUniform();
+  SetupShaderForUniform(GL_FLOAT_MAT3);
 };
 
 template <>
 void GLES2DecoderTestBase::SpecializedSetup<UniformMatrix3fvImmediate, 0>(
     bool /* valid */) {
-  SetupShaderForUniform();
+  SetupShaderForUniform(GL_FLOAT_MAT3);
 };
 
 template <>
 void GLES2DecoderTestBase::SpecializedSetup<UniformMatrix4fv, 0>(
     bool /* valid */) {
-  SetupShaderForUniform();
+  SetupShaderForUniform(GL_FLOAT_MAT4);
 };
 
 template <>
 void GLES2DecoderTestBase::SpecializedSetup<UniformMatrix4fvImmediate, 0>(
     bool /* valid */) {
-  SetupShaderForUniform();
+  SetupShaderForUniform(GL_FLOAT_MAT4);
 };
 
 template <>
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
index 1b0697a..826296c 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
@@ -528,14 +528,14 @@ void GLES2DecoderTestBase::SetupExpectationsForFramebufferClearingMulti(
   }
 }
 
-void GLES2DecoderTestBase::SetupShaderForUniform() {
+void GLES2DecoderTestBase::SetupShaderForUniform(GLenum uniform_type) {
   static AttribInfo attribs[] = {
     { "foo", 1, GL_FLOAT, 1, },
     { "goo", 1, GL_FLOAT, 2, },
   };
-  static UniformInfo uniforms[] = {
-    { "bar", 1, GL_INT, 0, 2, -1, },
-    { "car", 4, GL_INT, 1, 1, -1, },
+  UniformInfo uniforms[] = {
+    { "bar", 1, uniform_type, 0, 2, -1, },
+    { "car", 4, uniform_type, 1, 1, -1, },
   };
   const GLuint kClientVertexShaderId = 5001;
   const GLuint kServiceVertexShaderId = 6001;
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h
index 351d081..158bf09 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h
@@ -183,7 +183,7 @@ class GLES2DecoderTestBase : public testing::Test {
   void ExpectEnableDisable(GLenum cap, bool enable);
 
   // Setups up a shader for testing glUniform.
-  void SetupShaderForUniform();
+  void SetupShaderForUniform(GLenum uniform_type);
   void SetupDefaultProgram();
   void SetupCubemapProgram();
   void SetupTexture();