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/GrGLProgram.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/GrGLProgram.cpp')
| -rw-r--r-- | src/gpu/GrGLProgram.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gpu/GrGLProgram.cpp b/src/gpu/GrGLProgram.cpp index e05b6c3880..26ada9c988 100644 --- a/src/gpu/GrGLProgram.cpp +++ b/src/gpu/GrGLProgram.cpp @@ -363,13 +363,13 @@ namespace { const char* glsl_version_string(const GrGLInterface* gl, GrGLProgram::GLSLVersion v) { switch (v) { - case GrGLProgram::k120_GLSLVersion: + case GrGLProgram::k110_GLSLVersion: if (gl->supportsES()) { // ES2s shader language is based on version 1.20 but is version // 1.00 of the ES language. return "#version 100\n"; } else { - return "#version 120\n"; + return "#version 110\n"; } case GrGLProgram::k130_GLSLVersion: GrAssert(!gl->supportsES()); @@ -524,7 +524,7 @@ bool decl_and_get_fs_color_output(GrGLProgram::GLSLVersion v, VarArray* fsOutputs, const char** name) { switch (v) { - case GrGLProgram::k120_GLSLVersion: + case GrGLProgram::k110_GLSLVersion: *name = "gl_FragColor"; return false; break; @@ -977,10 +977,10 @@ bool GrGLProgram::CompileShaders(const GrGLInterface* gl, static const char* gVaryingPrefixes[2][2] = {{"varying", "varying"}, {"out", "in"}}; - const char** varyingPrefixes = k120_GLSLVersion == glslVersion ? + const char** varyingPrefixes = k110_GLSLVersion == glslVersion ? gVaryingPrefixes[0] : gVaryingPrefixes[1]; - const char* attributePrefix = k120_GLSLVersion == glslVersion ? + const char* attributePrefix = k110_GLSLVersion == glslVersion ? "attribute" : "in"; @@ -1031,8 +1031,8 @@ bool GrGLProgram::CompileShaders(const GrGLInterface* gl, append_string(precisionStr, &strs, &lengths); append_decls(segments.fFSUnis, gl, "uniform", &strs, &lengths, &temps); append_decls(segments.fFSInputs, gl, varyingPrefixes[1], &strs, &lengths, &temps); - // We shouldn't have declared outputs on 1.2 - GrAssert(k120_GLSLVersion != glslVersion || segments.fFSOutputs.empty()); + // We shouldn't have declared outputs on 1.10 + GrAssert(k110_GLSLVersion != glslVersion || segments.fFSOutputs.empty()); append_decls(segments.fFSOutputs, gl, "out", &strs, &lengths, &temps); append_string(segments.fFSFunctions, &strs, &lengths); append_string(segments.fFSCode, &strs, &lengths); |