Index: gpu/command_buffer/service/program_manager_unittest.cc |
diff --git a/gpu/command_buffer/service/program_manager_unittest.cc b/gpu/command_buffer/service/program_manager_unittest.cc |
index 326486108b10bc773883587fd815ae40673617d4..8c18b8f8d68ef7eb6c138edecc2d9869f4795903 100644 |
--- a/gpu/command_buffer/service/program_manager_unittest.cc |
+++ b/gpu/command_buffer/service/program_manager_unittest.cc |
@@ -31,6 +31,16 @@ using ::testing::SetArrayArgument; |
using ::testing::SetArgumentPointee; |
using ::testing::StrEq; |
+// ANGLE now uses GLenum values directory for types |
+// TODO(jmadill): Delete these defines when the ANGLE |
+// roll reliably passes translator version 126 |
+#if (ANGLE_SH_VERSION >= 126) |
+#define SH_FLOAT GL_FLOAT |
+#define SH_FLOAT_VEC2 GL_FLOAT_VEC2 |
+#define SH_FLOAT_VEC3 GL_FLOAT_VEC3 |
+#define SH_FLOAT_VEC4 GL_FLOAT_VEC4 |
+#endif |
+ |
namespace gpu { |
namespace gles2 { |