diff options
| author |  egdaniel <egdaniel@google.com> | 2015-10-21 10:45:48 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-10-21 10:45:48 -0700 |
| commit | 0d3f061262a53b775f0a92b0abf8a4a846290d65 (patch) | |
| tree | bc17cd4c004d97c5989951bc26e5d4b26925e7b6 /src/gpu/gl/GrGLGpu.cpp | |
| parent | 3d9d7a7213748761d46ade183e11aa7cb55313c1 (diff) | |
Move GrGLShaderVar to GrGLSL
BUG=skia:
Review URL: https://codereview.chromium.org/1417123002
Diffstat (limited to 'src/gpu/gl/GrGLGpu.cpp')
| -rw-r--r-- | src/gpu/gl/GrGLGpu.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp index d380323064..9834b6e617 100644 --- a/src/gpu/gl/GrGLGpu.cpp +++ b/src/gpu/gl/GrGLGpu.cpp @@ -2811,13 +2811,13 @@ bool GrGLGpu::onCopySurface(GrSurface* dst, void GrGLGpu::createCopyProgram() { const char* version = GrGLGetGLSLVersionDecl(this->ctxInfo()); - GrGLShaderVar aVertex("a_vertex", kVec2f_GrSLType, GrShaderVar::kAttribute_TypeModifier); - GrGLShaderVar uTexCoordXform("u_texCoordXform", kVec4f_GrSLType, + GrGLSLShaderVar aVertex("a_vertex", kVec2f_GrSLType, GrShaderVar::kAttribute_TypeModifier); + GrGLSLShaderVar uTexCoordXform("u_texCoordXform", kVec4f_GrSLType, GrShaderVar::kUniform_TypeModifier); - GrGLShaderVar uPosXform("u_posXform", kVec4f_GrSLType, GrShaderVar::kUniform_TypeModifier); - GrGLShaderVar uTexture("u_texture", kSampler2D_GrSLType, GrShaderVar::kUniform_TypeModifier); - GrGLShaderVar vTexCoord("v_texCoord", kVec2f_GrSLType, GrShaderVar::kVaryingOut_TypeModifier); - GrGLShaderVar oFragColor("o_FragColor", kVec4f_GrSLType, GrShaderVar::kOut_TypeModifier); + GrGLSLShaderVar uPosXform("u_posXform", kVec4f_GrSLType, GrShaderVar::kUniform_TypeModifier); + GrGLSLShaderVar uTexture("u_texture", kSampler2D_GrSLType, GrShaderVar::kUniform_TypeModifier); + GrGLSLShaderVar vTexCoord("v_texCoord", kVec2f_GrSLType, GrShaderVar::kVaryingOut_TypeModifier); + GrGLSLShaderVar oFragColor("o_FragColor", kVec4f_GrSLType, GrShaderVar::kOut_TypeModifier); SkString vshaderTxt(version); aVertex.appendDecl(this->glCaps().glslCaps(), &vshaderTxt); |