Move program descriptor and primitive processor off of optstate

tests/GLProgramsTest.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 // This is a GPU-backend specific test. It relies on static intializers to work
 
@@ skipping 298 matching lines @@
             SkDebugf("Couldn't setup dst read texture");
             return false;
         }
 
         // 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, primProc, *gpu->caps(), scissor, &dstCopy, drawType);
         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;
         }
 
         // because occasionally optimized drawstate creation will fail for valid reasons, we only
         // want to increment on success
         ++t;
     }
     return true;
@@ skipping 27 matching lines @@
             }
 #endif
             GrTestTarget target;
             context->getTestTarget(&target);
             REPORTER_ASSERT(reporter, target.target()->programUnitTest(maxStages));
         }
     }
 }
 
 #endif