diff options
| author |  joshualitt <joshualitt@chromium.org> | 2014-10-07 12:42:26 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-10-07 12:42:26 -0700 |
| commit | db0d3ca07008ea2c1f24d0fd9ceecf10af6ae63b (patch) | |
| tree | 12ff0bd9f07193593b7db1d52ef2fe0478c00aeb /src/gpu/effects/GrCustomCoordsTextureEffect.cpp | |
| parent | fe1233c3f12f81bb675718516bbb32f72af726ec (diff) | |
Revert of Cleanup of shader building system (patchset #25 id:470001 of https://codereview.chromium.org/611653002/)
Reason for revert:
Seems to have messed up windows 7 gms
Original issue's description:
> Cleanup of shader building system
>
> this is a huge refactor and cleanup of the gl shader building system in
> Skia. The entire shader building pipeline is now part of
> GrGLProgramCreator, which takes a gp, and some fps, and creates a
> program. I added some subclasses of GrGLProgram to handle the
> eccentricities of Nvpr/Nvpres. Outside of the builders folder
> and GrGLPrograms, this change is basically just a rename
>
>
> solo gp
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/fe1233c3f12f81bb675718516bbb32f72af726ec
TBR=bsalomon@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/635533005
Diffstat (limited to 'src/gpu/effects/GrCustomCoordsTextureEffect.cpp')
| -rw-r--r-- | src/gpu/effects/GrCustomCoordsTextureEffect.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gpu/effects/GrCustomCoordsTextureEffect.cpp b/src/gpu/effects/GrCustomCoordsTextureEffect.cpp index e89e46cb5a..7362ba98a6 100644 --- a/src/gpu/effects/GrCustomCoordsTextureEffect.cpp +++ b/src/gpu/effects/GrCustomCoordsTextureEffect.cpp @@ -6,7 +6,7 @@ */ #include "GrCustomCoordsTextureEffect.h" -#include "gl/builders/GrGLProgramBuilder.h" +#include "gl/builders/GrGLFullProgramBuilder.h" #include "gl/GrGLProcessor.h" #include "gl/GrGLSL.h" #include "gl/GrGLTexture.h" @@ -19,7 +19,7 @@ public: GrGLCustomCoordsTextureEffect(const GrBackendProcessorFactory& factory, const GrProcessor&) : INHERITED (factory) {} - virtual void emitCode(GrGLGPBuilder* builder, + virtual void emitCode(GrGLFullProgramBuilder* builder, const GrGeometryProcessor& geometryProcessor, const GrProcessorKey& key, const char* outputColor, @@ -36,11 +36,11 @@ public: builder->addVarying(kVec2f_GrSLType, "textureCoords", &vsVaryingName, &fsVaryingNamePtr); fsCoordName = fsVaryingNamePtr; - GrGLVertexBuilder* vsBuilder = builder->getVertexShaderBuilder(); + GrGLVertexShaderBuilder* vsBuilder = builder->getVertexShaderBuilder(); const GrShaderVar& inTextureCoords = customCoordsTextureEffect.inTextureCoords(); vsBuilder->codeAppendf("\t%s = %s;\n", vsVaryingName, inTextureCoords.c_str()); - GrGLGPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLProcessorFragmentShaderBuilder* fsBuilder = builder->getFragmentShaderBuilder(); fsBuilder->codeAppendf("\t%s = ", outputColor); fsBuilder->appendTextureLookupAndModulate(inputColor, samplers[0], |