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

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

Issue 373833002: Fix gpu_unittests for new Shader Translator header. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added TODO comments Created 6 years, 5 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/mocks.h ('k') | gpu/command_buffer/service/shader_translator_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 {
« no previous file with comments | « gpu/command_buffer/service/mocks.h ('k') | gpu/command_buffer/service/shader_translator_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698