diff options
| author |  egdaniel <egdaniel@google.com> | 2016-09-07 07:24:12 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-09-07 07:24:12 -0700 |
| commit | 5d8f69f2d492a15189e4b976ccca3fa092876419 (patch) | |
| tree | cd3992a510ba5260e7c03bbe298d96af68a49c0b /src/gpu/gl/builders | |
| parent | 653212c37efaa6d3175882559634772528bb8ad2 (diff) | |
Merge GrGLSLProgramDesc into GrProgramDesc
BUG=skia:
Review-Url: https://codereview.chromium.org/2318523006
Diffstat (limited to 'src/gpu/gl/builders')
| -rw-r--r-- | src/gpu/gl/builders/GrGLProgramBuilder.cpp | 6 | ||||
| -rw-r--r-- | src/gpu/gl/builders/GrGLProgramBuilder.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.cpp b/src/gpu/gl/builders/GrGLProgramBuilder.cpp index 2bbeb42af6..370cee6a0e 100644 --- a/src/gpu/gl/builders/GrGLProgramBuilder.cpp +++ b/src/gpu/gl/builders/GrGLProgramBuilder.cpp @@ -10,6 +10,7 @@ #include "GrAutoLocaleSetter.h" #include "GrCoordTransform.h" #include "GrGLProgramBuilder.h" +#include "GrProgramDesc.h" #include "GrSwizzle.h" #include "GrTexture.h" #include "SkTraceEvent.h" @@ -21,7 +22,6 @@ #include "glsl/GrGLSLFragmentProcessor.h" #include "glsl/GrGLSLGeometryProcessor.h" #include "glsl/GrGLSLProgramDataManager.h" -#include "glsl/GrGLSLProgramDesc.h" #include "glsl/GrGLSLSampler.h" #include "glsl/GrGLSLXferProcessor.h" @@ -30,7 +30,7 @@ GrGLProgram* GrGLProgramBuilder::CreateProgram(const GrPipeline& pipeline, const GrPrimitiveProcessor& primProc, - const GrGLSLProgramDesc& desc, + const GrProgramDesc& desc, GrGLGpu* gpu) { GrAutoLocaleSetter als("C"); @@ -56,7 +56,7 @@ GrGLProgram* GrGLProgramBuilder::CreateProgram(const GrPipeline& pipeline, GrGLProgramBuilder::GrGLProgramBuilder(GrGLGpu* gpu, const GrPipeline& pipeline, const GrPrimitiveProcessor& primProc, - const GrGLSLProgramDesc& desc) + const GrProgramDesc& desc) : INHERITED(pipeline, primProc, desc) , fGpu(gpu) , fVaryingHandler(this) diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.h b/src/gpu/gl/builders/GrGLProgramBuilder.h index 4f441be668..253f9e6328 100644 --- a/src/gpu/gl/builders/GrGLProgramBuilder.h +++ b/src/gpu/gl/builders/GrGLProgramBuilder.h @@ -17,7 +17,7 @@ class GrFragmentProcessor; class GrGLContextInfo; -class GrGLSLProgramDesc; +class GrProgramDesc; class GrGLSLShaderBuilder; class GrGLSLCaps; @@ -32,7 +32,7 @@ public: */ static GrGLProgram* CreateProgram(const GrPipeline&, const GrPrimitiveProcessor&, - const GrGLSLProgramDesc&, + const GrProgramDesc&, GrGLGpu*); const GrCaps* caps() const override; @@ -42,7 +42,7 @@ public: private: GrGLProgramBuilder(GrGLGpu*, const GrPipeline&, const GrPrimitiveProcessor&, - const GrGLSLProgramDesc&); + const GrProgramDesc&); bool compileAndAttachShaders(GrGLSLShaderBuilder& shader, GrGLuint programId, |