Move program descriptor and primitive processor off of optstate

tests/GLProgramsTest.cpp

Index: tests/GLProgramsTest.cpp
diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp
index 0a28ba2feb93c83add2c7926c4d69f0bfb51d8e2..4dcba37c91c4373a2f546862301769fd6a310262 100644
--- a/tests/GLProgramsTest.cpp
+++ b/tests/GLProgramsTest.cpp
@@ -316,8 +316,15 @@ bool GrDrawTarget::programUnitTest(int maxStages) {
         if (ods.mustSkip()) {
             continue;
         }
-        ods.finalize(gpu);
-        SkAutoTUnref<GrGLProgram> program(GrGLProgramBuilder::CreateProgram(ods, gpu));
+        GrBatchTracker bt;
+        primProc->initBatchTracker(&bt, ods.getInitBatchTracker());
+
+        GrProgramDesc desc;
+        gpu->buildProgramDesc(&desc, *primProc, ods, ods.descInfo(), ods.drawType(), bt);
+
+        GrGpu::DrawArgs args(primProc, &ods, &desc, &bt);
+        SkAutoTUnref<GrGLProgram> program(GrGLProgramBuilder::CreateProgram(args, gpu));
+
         if (NULL == program.get()) {
             SkDebugf("Failed to create program!");
             return false;