diff options
| author |  egdaniel <egdaniel@google.com> | 2015-11-13 11:57:27 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-11-13 11:57:27 -0800 |
| commit | 57d3b039c635945e1dc2fcbac3462ed8bfedb068 (patch) | |
| tree | 1b119d77bc2f5dbb58587484f73f9ecbc4794039 /src/gpu/gl | |
| parent | 04d52f3a92bb3d72e035a7c002926953edb0b505 (diff) | |
Rename some processor functions from GL to GLSL
TBR=bsalomon@google.com
BUG=skia:
Review URL: https://codereview.chromium.org/1443743002
Diffstat (limited to 'src/gpu/gl')
| -rw-r--r-- | src/gpu/gl/GrGLProgramDesc.cpp | 6 | ||||
| -rw-r--r-- | src/gpu/gl/builders/GrGLProgramBuilder.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/gpu/gl/GrGLProgramDesc.cpp b/src/gpu/gl/GrGLProgramDesc.cpp index 7c482d57b8..172aca77ab 100644 --- a/src/gpu/gl/GrGLProgramDesc.cpp +++ b/src/gpu/gl/GrGLProgramDesc.cpp @@ -88,7 +88,7 @@ static bool get_frag_proc_and_meta_keys(const GrPrimitiveProcessor& primProc, } } - fp.getGLProcessorKey(*caps.glslCaps(), b); + fp.getGLSLProcessorKey(*caps.glslCaps(), b); //**** use glslCaps here? return get_meta_key(fp, caps, primProc.getTransformKey(fp.coordTransforms(), @@ -113,7 +113,7 @@ bool GrGLProgramDescBuilder::Build(GrProgramDesc* desc, GrProcessorKeyBuilder b(&glDesc->key()); - primProc.getGLProcessorKey(*gpu->glCaps().glslCaps(), &b); + primProc.getGLSLProcessorKey(*gpu->glCaps().glslCaps(), &b); //**** use glslCaps here? if (!get_meta_key(primProc, gpu->glCaps(), 0, &b)) { glDesc->key().reset(); @@ -129,7 +129,7 @@ bool GrGLProgramDescBuilder::Build(GrProgramDesc* desc, } const GrXferProcessor& xp = *pipeline.getXferProcessor(); - xp.getGLProcessorKey(*gpu->glCaps().glslCaps(), &b); + xp.getGLSLProcessorKey(*gpu->glCaps().glslCaps(), &b); //**** use glslCaps here? if (!get_meta_key(xp, gpu->glCaps(), 0, &b)) { glDesc->key().reset(); diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.cpp b/src/gpu/gl/builders/GrGLProgramBuilder.cpp index f5108c26af..9f28e3fac3 100644 --- a/src/gpu/gl/builders/GrGLProgramBuilder.cpp +++ b/src/gpu/gl/builders/GrGLProgramBuilder.cpp @@ -254,7 +254,7 @@ void GrGLProgramBuilder::emitAndInstallProc(const GrFragmentProcessor& fp, const char* inColor) { GrGLInstalledFragProc* ifp = new GrGLInstalledFragProc; - ifp->fGLProc.reset(fp.createGLInstance()); + ifp->fGLProc.reset(fp.createGLSLInstance()); SkSTArray<4, GrGLSLTextureSampler> samplers(fp.numTextures()); this->emitSamplers(fp, &samplers, ifp); @@ -279,7 +279,7 @@ void GrGLProgramBuilder::emitAndInstallProc(const GrPrimitiveProcessor& gp, SkASSERT(!fGeometryProcessor); fGeometryProcessor = new GrGLInstalledGeoProc; - fGeometryProcessor->fGLProc.reset(gp.createGLInstance(*fGpu->glCaps().glslCaps())); + fGeometryProcessor->fGLProc.reset(gp.createGLSLInstance(*fGpu->glCaps().glslCaps())); SkSTArray<4, GrGLSLTextureSampler> samplers(gp.numTextures()); this->emitSamplers(gp, &samplers, fGeometryProcessor); @@ -302,7 +302,7 @@ void GrGLProgramBuilder::emitAndInstallXferProc(const GrXferProcessor& xp, SkASSERT(!fXferProcessor); fXferProcessor = new GrGLInstalledXferProc; - fXferProcessor->fGLProc.reset(xp.createGLInstance()); + fXferProcessor->fGLProc.reset(xp.createGLSLInstance()); // Enable dual source secondary output if we have one if (xp.hasSecondaryOutput()) { |