Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(254)

Unified Diff: tests/GLProgramsTest.cpp

Issue 637003003: Opt state takes a GP instead of a GeometryStage (Closed) Base URL: https://skia.googlesource.com/skia.git@builder_cleanup
Patch Set: memory leaks fixed Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/gpu/gl/builders/GrGLVertexShaderBuilder.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/GLProgramsTest.cpp
diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp
index 5ab35b7d227b9314d80fcd14e9c06e6a481cde8a..75032bdbe6a168b8b0a3daba063b0c9794823711 100644
--- a/tests/GLProgramsTest.cpp
+++ b/tests/GLProgramsTest.cpp
@@ -456,9 +456,6 @@ bool GrGpuGL::programUnitTest(int maxStages) {
ds->reset();
continue;
}
- const GrGeometryStage* geometryProcessor = NULL;
- SkSTArray<8, const GrFragmentStage*, true> colorStages;
- SkSTArray<8, const GrFragmentStage*, true> coverageStages;
GrGLProgramDesc desc;
GrDeviceCoordTexture dstCopy;
@@ -468,24 +465,14 @@ bool GrGpuGL::programUnitTest(int maxStages) {
}
if (!GrGLProgramDesc::Build(*ods,
drawType,
- ods->getSrcBlendCoeff(),
- ods->getDstBlendCoeff(),
this,
dstCopy.texture() ? &dstCopy : NULL,
- &geometryProcessor,
- &colorStages,
- &coverageStages,
&desc)) {
SkDebugf("Failed to generate GL program descriptor");
return false;
}
- SkAutoTUnref<GrGLProgram> program(GrGLProgramBuilder::CreateProgram(*ods,
- desc,
- drawType,
- geometryProcessor,
- colorStages.begin(),
- coverageStages.begin(),
- this));
+ SkAutoTUnref<GrGLProgram> program(
+ GrGLProgramBuilder::CreateProgram(*ods, desc, drawType, this));
if (NULL == program.get()) {
SkDebugf("Failed to create program!");
return false;
« no previous file with comments | « src/gpu/gl/builders/GrGLVertexShaderBuilder.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698