diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-10-19 20:43:20 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-10-19 20:43:20 +0000 |
| commit | 373a6635b7190b4af4d265fdd4b70f102ec3a6fd (patch) | |
| tree | dfa02655ebe3cc2f4f3ead29426c2eb1a80adcf9 /src/gpu/GrGpuGLShaders.cpp | |
| parent | 5960d0049585d66efdba058a0930870dafd44079 (diff) | |
Virtualize SkGLContext with subclasses SkNativeGLContext and SkMesaGLContext, allow both in gm
Review URL: http://codereview.appspot.com/5307045/
git-svn-id: http://skia.googlecode.com/svn/trunk@2499 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/GrGpuGLShaders.cpp')
| -rw-r--r-- | src/gpu/GrGpuGLShaders.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gpu/GrGpuGLShaders.cpp b/src/gpu/GrGpuGLShaders.cpp index 71444daf77..0742c3bdd9 100644 --- a/src/gpu/GrGpuGLShaders.cpp +++ b/src/gpu/GrGpuGLShaders.cpp @@ -149,22 +149,22 @@ GrGLProgram::GLSLVersion get_glsl_version(GrGLBinding binding, GrGLSLVersion ver = GrGLGetGLSLVersion(gl); switch (binding) { case kDesktop_GrGLBinding: - GrAssert(ver >= GR_GLSL_VER(1,20)); + GrAssert(ver >= GR_GLSL_VER(1,10)); if (ver >= GR_GLSL_VER(1,50)) { return GrGLProgram::k150_GLSLVersion; } else if (ver >= GR_GLSL_VER(1,30)) { return GrGLProgram::k130_GLSLVersion; } else { - return GrGLProgram::k120_GLSLVersion; + return GrGLProgram::k110_GLSLVersion; } case kES2_GrGLBinding: // version 1.00 of ES GLSL based on ver 1.20 of desktop GLSL GrAssert(ver >= GR_GL_VER(1,00)); - return GrGLProgram::k120_GLSLVersion; + return GrGLProgram::k110_GLSLVersion; default: GrCrash("Attempting to get GLSL version in unknown or fixed-" "function GL binding."); - return GrGLProgram::k120_GLSLVersion; // suppress warning + return GrGLProgram::k110_GLSLVersion; // suppress warning } } |