Revert of move program descriptor generation to flush

src/gpu/GrGpu.cpp

Index: src/gpu/GrGpu.cpp
diff --git a/src/gpu/GrGpu.cpp b/src/gpu/GrGpu.cpp
index ac76e1503c40d6905babce4e435e470d12625268..d97809f9520c671b9cfbc974858a78d938255a50 100644
--- a/src/gpu/GrGpu.cpp
+++ b/src/gpu/GrGpu.cpp
@@ -277,7 +277,7 @@
 
 void GrGpu::draw(const GrOptDrawState& ds, const GrDrawTarget::DrawInfo& info) {
     this->handleDirtyContext();
-    if (!this->flushGraphicsState(ds)) {
+    if (!this->flushGraphicsState(ds, PrimTypeToDrawType(info.primitiveType()))) {
         return;
     }
     this->onDraw(ds, info);
@@ -288,7 +288,7 @@
                         const GrStencilSettings& stencilSettings) {
     this->handleDirtyContext();
 
-    if (!this->flushGraphicsState(ds)) {
+    if (!this->flushGraphicsState(ds, kStencilPath_DrawType)) {
         return;
     }
 
@@ -301,7 +301,7 @@
                      const GrStencilSettings& stencilSettings) {
     this->handleDirtyContext();
 
-    if (!this->flushGraphicsState(ds)) {
+    if (!this->flushGraphicsState(ds, kDrawPath_DrawType)) {
         return;
     }
 
@@ -318,7 +318,7 @@
                       const GrStencilSettings& stencilSettings) {
     this->handleDirtyContext();
 
-    if (!this->flushGraphicsState(ds)) {
+    if (!this->flushGraphicsState(ds, kDrawPaths_DrawType)) {
         return;
     }