move program descriptor generation to flush
BUG=skia:
Committed: https://skia.googlesource.com/skia/+/829e1b80b1020b17f2078020c990e079b70c077c
Review URL: https://codereview.chromium.org/777673003
diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp
index aa8359d..7b73fdc 100644
--- a/tests/GLProgramsTest.cpp
+++ b/tests/GLProgramsTest.cpp
@@ -384,11 +384,12 @@
// create optimized draw state, setup readDst texture if required, and build a descriptor
// and program. ODS creation can fail, so we have to check
- GrOptDrawState ods(ds, gpu, scissor, &dstCopy, drawType);
+ GrOptDrawState ods(ds, *gpu->caps(), scissor, &dstCopy, drawType);
if (ods.mustSkip()) {
continue;
}
- SkAutoTUnref<GrGLProgram> program(GrGLProgramBuilder::CreateProgram(ods, drawType, gpu));
+ ods.finalize(gpu);
+ SkAutoTUnref<GrGLProgram> program(GrGLProgramBuilder::CreateProgram(ods, gpu));
if (NULL == program.get()) {
SkDebugf("Failed to create program!");
return false;