move program descriptor generation to flush

tests/GLProgramsTest.cpp

Index: tests/GLProgramsTest.cpp
diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp
index aa8359d5e55957e3951fcaad1eb55de515f7139a..9486dae962dfc35e33ce7c62c76cd5294f114c22 100644
--- a/tests/GLProgramsTest.cpp
+++ b/tests/GLProgramsTest.cpp
@@ -384,11 +384,18 @@ bool GrDrawTarget::programUnitTest(int maxStages) {
 
         // 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));
+
+        GrProgramDesc desc;
+        ((GrGpu*)gpu)->buildProgramDesc(ods, drawType, &desc);
+
+        SkAutoTUnref<GrGLProgram> program(GrGLProgramBuilder::CreateProgram(ods,
+                                                                            desc,
+                                                                            drawType,
+                                                                            gpu));
         if (NULL == program.get()) {
             SkDebugf("Failed to create program!");
             return false;