diff options
| author |  jvanverth <jvanverth@google.com> | 2015-06-24 06:59:57 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-06-24 06:59:57 -0700 |
| commit | cba99b88fd5fb39def7a094dc32c0745c7a1cfea (patch) | |
| tree | c2574908e1a63570bbd0eef0689efd7b783ff6a9 /src/gpu/gl/GrGLGpu.cpp | |
| parent | 1b8e1b5c499e31a671232c8ccb10e778e0d8b154 (diff) | |
Move GLSL-specific routines/classes to separate glsl directory
The purpose is to begin separating our GLSL-specific code from
our GL-specific code, so it can be used with the GL45 platform
Review URL: https://codereview.chromium.org/1202293002
Diffstat (limited to 'src/gpu/gl/GrGLGpu.cpp')
| -rw-r--r-- | src/gpu/gl/GrGLGpu.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp index b3bcdbe79c..20669b8e78 100644 --- a/src/gpu/gl/GrGLGpu.cpp +++ b/src/gpu/gl/GrGLGpu.cpp @@ -7,6 +7,7 @@ #include "GrGLGpu.h" +#include "GrGLGLSL.h" #include "GrGLStencilAttachment.h" #include "GrGLTextureRenderTarget.h" #include "GrGpuResourcePriv.h" @@ -18,6 +19,7 @@ #include "GrTypes.h" #include "GrVertices.h" #include "builders/GrGLShaderStringBuilder.h" +#include "glsl/GrGLSLCaps.h" #include "SkStrokeRec.h" #include "SkTemplates.h" @@ -2737,7 +2739,7 @@ bool GrGLGpu::copySurface(GrSurface* dst, void GrGLGpu::createCopyProgram() { - const char* version = GrGetGLSLVersionDecl(this->ctxInfo()); + const char* version = GrGLGetGLSLVersionDecl(this->ctxInfo()); GrGLShaderVar aVertex("a_vertex", kVec2f_GrSLType, GrShaderVar::kAttribute_TypeModifier); GrGLShaderVar uTexCoordXform("u_texCoordXform", kVec4f_GrSLType, @@ -2767,8 +2769,8 @@ void GrGLGpu::createCopyProgram() { ); SkString fshaderTxt(version); - GrGLSLAppendDefaultFloatPrecisionDeclaration(kDefault_GrSLPrecision, this->glStandard(), - &fshaderTxt); + GrGLAppendGLSLDefaultFloatPrecisionDeclaration(kDefault_GrSLPrecision, this->glStandard(), + &fshaderTxt); vTexCoord.setTypeModifier(GrShaderVar::kVaryingIn_TypeModifier); vTexCoord.appendDecl(this->ctxInfo(), &fshaderTxt); fshaderTxt.append(";"); |