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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gpu/command_buffer/service/shader_translator_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: No change 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
« gpu/command_buffer/service/program_manager_unittest.cc ('K') | « gpu/command_buffer/service/program_manager_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/shader_translator_unittest.cc
diff --git a/gpu/command_buffer/service/shader_translator_unittest.cc b/gpu/command_buffer/service/shader_translator_unittest.cc
index 233b412024cd73cf9ffcd78c7f976f1c2235c434..0c19d605f77fe060739ddc1fab6d18aff744daab 100644
--- a/gpu/command_buffer/service/shader_translator_unittest.cc
+++ b/gpu/command_buffer/service/shader_translator_unittest.cc
@@ -2,9 +2,18 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <GLES2/gl2.h>
+
#include "gpu/command_buffer/service/shader_translator.h"
#include "testing/gtest/include/gtest/gtest.h"
+// The ANGLE shader translator now uses native GLenums
Zhenyao Mo 2014/07/07 20:35:13 Same here, please add a TODO
+#if (ANGLE_SH_VERSION >= 126)
+#define SH_VERTEX_SHADER GL_VERTEX_SHADER
+#define SH_FRAGMENT_SHADER GL_FRAGMENT_SHADER
+#define SH_FLOAT_VEC4 GL_FLOAT_VEC4
+#endif
+
namespace gpu {
namespace gles2 {
« gpu/command_buffer/service/program_manager_unittest.cc ('K') | « gpu/command_buffer/service/program_manager_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698