Cleanup handling of GL versions, fix function names
Review URL: http://codereview.appspot.com/5097044/
git-svn-id: http://skia.googlecode.com/svn/trunk@2308 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gpu/src/GrGpuGLShaders.cpp b/gpu/src/GrGpuGLShaders.cpp
index 28a6e07..7d15c4f 100644
--- a/gpu/src/GrGpuGLShaders.cpp
+++ b/gpu/src/GrGpuGLShaders.cpp
@@ -141,12 +141,13 @@
namespace {
-GrGLProgram::GLSLVersion get_glsl_version(GrGLBinding binding, float glVersion) {
+GrGLProgram::GLSLVersion get_glsl_version(GrGLBinding binding, GrGLVersion glVersion) {
switch (binding) {
case kDesktop_GrGLBinding:
// TODO: proper check of the glsl version string
- return (glVersion >= 3.0) ? GrGLProgram::k130_GLSLVersion :
- GrGLProgram::k120_GLSLVersion;
+ return (glVersion >= GR_GL_VER(3,0)) ?
+ GrGLProgram::k130_GLSLVersion :
+ GrGLProgram::k120_GLSLVersion;
case kES2_GrGLBinding:
return GrGLProgram::k120_GLSLVersion;
default:
@@ -292,8 +293,7 @@
fShaderSupport = true;
if (kDesktop_GrGLBinding == this->glBinding()) {
fDualSourceBlendingSupport =
- this->glVersion() >= 3.25f || // TODO: when resolving Issue 387 change
- // this back to 3.3
+ this->glVersion() >= GR_GL_VER(3,3) ||
this->hasExtension("GL_ARB_blend_func_extended");
fShaderDerivativeSupport = true;
} else {