update chrome-specific glconfig (should make versions of this for mac/win/linux)
git-svn-id: http://skia.googlecode.com/svn/trunk@715 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gpu/include/GrGLConfig.h b/gpu/include/GrGLConfig.h
index 5c23495..cdcc97f 100644
--- a/gpu/include/GrGLConfig.h
+++ b/gpu/include/GrGLConfig.h
@@ -167,8 +167,10 @@
#define GR_SUPPORT_GLES ((GR_SUPPORT_GLES1) || (GR_SUPPORT_GLES2))
-#if !(GR_SUPPORT_GLES) != !(GR_SUPPORT_DESKTOP)
- #error "Either desktop of ES GL must be supported but not both"
+#if !GR_SUPPORT_GLES && !GR_SUPPORT_GLDESKTOP
+ #error "Either desktop or ES GL must be supported"
+#elif GR_SUPPORT_GLES && GR_SUPPORT_GLDESKTOP
+ #error "Cannot support both desktop and ES GL"
#endif
#if !defined(GR_GL_FUNC)
diff --git a/gpu/include/GrGLConfig_chrome.h b/gpu/include/GrGLConfig_chrome.h
new file mode 100644
index 0000000..e2294c0
--- /dev/null
+++ b/gpu/include/GrGLConfig_chrome.h
@@ -0,0 +1,19 @@
+#ifndef GrGLConfig_chrome_DEFINED
+#define GrGLConfig_chrome_DEFINED
+
+#define GR_SUPPORT_GLES2 1
+
+// gl2ext.h will define these extensions macros but Chrome doesn't provide
+// prototypes.
+#define GL_OES_mapbuffer 0
+#define GL_IMG_multisampled_render_to_texture 0
+
+#include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
+
+#define GR_GL_FUNC
+
+#define GR_GL_PROC_ADDRESS(X) &X
+//#define GR_GL_PROC_ADDRESS_HEADER
+
+#endif
diff --git a/gpu/include/GrGLCustomSetupHeader_chrome.h b/gpu/include/GrGLCustomSetupHeader_chrome.h
deleted file mode 100644
index 018fd15..0000000
--- a/gpu/include/GrGLCustomSetupHeader_chrome.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef Chrome_GR_GL_CUSTOM_SETUP_HEADER
-#define Chrome_GR_GL_CUSTOM_SETUP_HEADER
-
-#define GR_INCLUDE_GLES2 <GLES2/gl2.h>
-#define GR_INCLUDE_GLES2ext <GLES2/gl2ext.h>
-
-#define GR_GL_FUNC
-
-#define GR_GL_PROC_ADDRESS(X) &X
-#define GR_GL_PROC_ADDRESS_HEADER
-
-#endif