aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-03-20 15:28:14 +0000
committerGravatar djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-03-20 15:28:14 +0000
commit55e713c697fdea27b13e45bffcdeaabf2a546b88 (patch)
tree04bd54c8f7f312d8ee4269caf264ecaca46514e8
parent0a89c90d18ab5082f2fde5076ce422aac493bb00 (diff)
Add temp android modification to the GLSL version check
Review URL: https://codereview.appspot.com/5845076 git-svn-id: http://skia.googlecode.com/svn/trunk@3440 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r--src/gpu/gl/GrGLInterface.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/gpu/gl/GrGLInterface.cpp b/src/gpu/gl/GrGLInterface.cpp
index 7fb871c638..75047cac4f 100644
--- a/src/gpu/gl/GrGLInterface.cpp
+++ b/src/gpu/gl/GrGLInterface.cpp
@@ -95,6 +95,15 @@ GrGLSLVersion GrGLGetGLSLVersionFromString(const char* versionString) {
if (2 == n) {
return GR_GLSL_VER(major, minor);
}
+
+#ifdef SK_BUILD_FOR_ANDROID
+ // android hack until the gpu vender updates their drivers
+ n = sscanf(versionString, "OpenGL ES GLSL %d.%d", &major, &minor);
+ if (2 == n) {
+ return GR_GLSL_VER(major, minor);
+ }
+#endif
+
return 0;
}