diff options
| author |  joshualitt <joshualitt@chromium.org> | 2015-01-21 11:52:36 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-01-21 11:52:36 -0800 |
| commit | 17e7314e0e3085ec6021997d7c0593c339ba6a2e (patch) | |
| tree | d6711e665e1d309d3790dcfc6c7058bbf93f54d8 /src/gpu/gl/builders | |
| parent | d4742fa550bafce5225cd267437eadef177c5945 (diff) | |
remove drawtype
BUG=skia:
Review URL: https://codereview.chromium.org/862933005
Diffstat (limited to 'src/gpu/gl/builders')
| -rw-r--r-- | src/gpu/gl/builders/GrGLProgramBuilder.cpp | 4 | ||||
| -rw-r--r-- | src/gpu/gl/builders/GrGLProgramBuilder.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.cpp b/src/gpu/gl/builders/GrGLProgramBuilder.cpp index c26a72ec50..9fbb4c1953 100644 --- a/src/gpu/gl/builders/GrGLProgramBuilder.cpp +++ b/src/gpu/gl/builders/GrGLProgramBuilder.cpp @@ -74,7 +74,7 @@ GrGLProgram* GrGLProgramBuilder::CreateProgram(const DrawArgs& args, GrGLGpu* gp GrGLProgramBuilder* GrGLProgramBuilder::CreateProgramBuilder(const DrawArgs& args, GrGLGpu* gpu) { - if (GrGpu::IsPathRenderingDrawType(args.fDrawType)) { + if (args.fPrimitiveProcessor->isPathRendering()) { SkASSERT(gpu->glCaps().pathRenderingSupport() && !args.fPrimitiveProcessor->willUseGeoShader() && args.fPrimitiveProcessor->numAttribs() == 0); @@ -396,7 +396,7 @@ GrGLProgram* GrGLProgramBuilder::finalize() { // Legacy nvpr will not compile with a vertex shader, but newer nvpr requires a dummy vertex // shader - bool useNvpr = GrGpu::IsPathRenderingDrawType(this->drawType()); + bool useNvpr = primitiveProcessor().isPathRendering(); if (!(useNvpr && fGpu->glCaps().nvprSupport() == GrGLCaps::kLegacy_NvprSupport)) { if (!fVS.compileAndAttachShaders(programID, &shadersToDelete)) { this->cleanupProgram(programID, shadersToDelete); diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.h b/src/gpu/gl/builders/GrGLProgramBuilder.h index 37cd57f164..612791e078 100644 --- a/src/gpu/gl/builders/GrGLProgramBuilder.h +++ b/src/gpu/gl/builders/GrGLProgramBuilder.h @@ -287,7 +287,6 @@ protected: const GrProgramDesc& desc() const { return *fArgs.fDesc; } const GrBatchTracker& batchTracker() const { return *fArgs.fBatchTracker; } const GrProgramDesc::KeyHeader& header() const { return fArgs.fDesc->header(); } - GrGpu::DrawType drawType() const { return fArgs.fDrawType; } // Generates a name for a variable. The generated string will be name prefixed by the prefix // char (unless the prefix is '\0'). It also mangles the name to be stage-specific if we're |