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

Unified Diff: include/gpu/gl/GrGLConfig.h

Issue 12390021: Move the default definition of GR_USE_NEW_SHADER_SOURCE_SIGNATURE to GrGLConfig. (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Created 7 years, 10 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 | « include/gpu/GrConfig.h ('k') | include/gpu/gl/GrGLConfig_chrome.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/gpu/gl/GrGLConfig.h
===================================================================
--- include/gpu/gl/GrGLConfig.h (revision 7901)
+++ include/gpu/gl/GrGLConfig.h (working copy)
@@ -100,6 +100,10 @@
* GR_GL_MUST_USE_VBO: Indicates that all vertices and indices must be rendered
* from VBOs. Chromium's command buffer doesn't allow glVertexAttribArray with
* ARARY_BUFFER 0 bound or glDrawElements with ELEMENT_ARRAY_BUFFER 0 bound.
+ *
+ * GR_GL_USE_NEW_SHADER_SOURCE_SIGNATURE is for compatibility with the new version
+ * of the OpenGLES2.0 headers from Khronos. glShaderSource now takes a const char * const *,
+ * instead of a const char
*/
#if !defined(GR_GL_LOG_CALLS)
@@ -154,6 +158,10 @@
#define GR_GL_MUST_USE_VBO 0
#endif
+#if !defined(GR_GL_USE_NEW_SHADER_SOURCE_SIGNATURE)
+ #define GR_GL_USE_NEW_SHADER_SOURCE_SIGNATURE 0
+#endif
+
/**
* There is a strange bug that occurs on Macs with NVIDIA GPUs. We don't
* fully understand it. When (element) array buffers are continually
« no previous file with comments | « include/gpu/GrConfig.h ('k') | include/gpu/gl/GrGLConfig_chrome.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698