diff options
| author |  egdaniel <egdaniel@google.com> | 2015-11-13 09:55:43 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-11-13 09:55:43 -0800 |
| commit | e659a581f63fdccb64dce2dc8a478cf56831feea (patch) | |
| tree | efef38bff117135e343b7b2b192af10b1f2262e3 /src/gpu/gl/builders | |
| parent | 60795d99fff8caedc2e82bebcfa8bd4fa07231b7 (diff) | |
Move GrGLPrimitive/GeometryProc to GLSL
BUG=skia:
Review URL: https://codereview.chromium.org/1441683008
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 | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.cpp b/src/gpu/gl/builders/GrGLProgramBuilder.cpp index 8dca667e41..f5108c26af 100644 --- a/src/gpu/gl/builders/GrGLProgramBuilder.cpp +++ b/src/gpu/gl/builders/GrGLProgramBuilder.cpp @@ -13,13 +13,13 @@ #include "GrTexture.h" #include "SkRTConf.h" #include "SkTraceEvent.h" -#include "gl/GrGLGeometryProcessor.h" #include "gl/GrGLGpu.h" #include "gl/GrGLProgram.h" #include "gl/GrGLSLPrettyPrint.h" #include "gl/builders/GrGLShaderStringBuilder.h" #include "glsl/GrGLSLCaps.h" #include "glsl/GrGLSLFragmentProcessor.h" +#include "glsl/GrGLSLGeometryProcessor.h" #include "glsl/GrGLSLProgramDataManager.h" #include "glsl/GrGLSLTextureSampler.h" #include "glsl/GrGLSLXferProcessor.h" @@ -153,7 +153,7 @@ const GrGLSLCaps* GrGLProgramBuilder::glslCaps() const { bool GrGLProgramBuilder::emitAndInstallProcs(GrGLSLExpr4* inputColor, GrGLSLExpr4* inputCoverage) { // First we loop over all of the installed processors and collect coord transforms. These will - // be sent to the GrGLPrimitiveProcessor in its emitCode function + // be sent to the GrGLSLPrimitiveProcessor in its emitCode function const GrPrimitiveProcessor& primProc = this->primitiveProcessor(); int totalTextures = primProc.numTextures(); const int maxTextureUnits = fGpu->glCaps().maxFragmentTextureUnits(); @@ -284,7 +284,7 @@ void GrGLProgramBuilder::emitAndInstallProc(const GrPrimitiveProcessor& gp, SkSTArray<4, GrGLSLTextureSampler> samplers(gp.numTextures()); this->emitSamplers(gp, &samplers, fGeometryProcessor); - GrGLGeometryProcessor::EmitArgs args(this, gp, outColor, outCoverage, samplers, + GrGLSLGeometryProcessor::EmitArgs args(this, gp, outColor, outCoverage, samplers, fCoordTransforms, &fOutCoords); fGeometryProcessor->fGLProc->emitCode(args); diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.h b/src/gpu/gl/builders/GrGLProgramBuilder.h index 02fa88688b..3a8dcd8500 100644 --- a/src/gpu/gl/builders/GrGLProgramBuilder.h +++ b/src/gpu/gl/builders/GrGLProgramBuilder.h @@ -9,8 +9,8 @@ #define GrGLProgramBuilder_DEFINED #include "GrPipeline.h" -#include "gl/GrGLPrimitiveProcessor.h" #include "gl/GrGLProgramDataManager.h" +#include "glsl/GrGLSLPrimitiveProcessor.h" #include "glsl/GrGLSLProgramBuilder.h" #include "glsl/GrGLSLProgramDataManager.h" #include "glsl/GrGLSLTextureSampler.h" @@ -30,7 +30,7 @@ struct GrGLInstalledProc { SkAutoTDelete<Proc> fGLProc; }; -typedef GrGLInstalledProc<GrGLPrimitiveProcessor> GrGLInstalledGeoProc; +typedef GrGLInstalledProc<GrGLSLPrimitiveProcessor> GrGLInstalledGeoProc; typedef GrGLInstalledProc<GrGLSLXferProcessor> GrGLInstalledXferProc; typedef GrGLInstalledProc<GrGLSLFragmentProcessor> GrGLInstalledFragProc; @@ -176,8 +176,8 @@ private: GrGLGpu* fGpu; UniformInfoArray fUniforms; - GrGLPrimitiveProcessor::TransformsIn fCoordTransforms; - GrGLPrimitiveProcessor::TransformsOut fOutCoords; + GrGLSLPrimitiveProcessor::TransformsIn fCoordTransforms; + GrGLSLPrimitiveProcessor::TransformsOut fOutCoords; SkTArray<UniformHandle> fSamplerUniforms; SeparableVaryingInfoArray fSeparableVaryingInfos; |