Make createOptDrawState return NULL if we would end up not drawing

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 314 matching lines @@
                              dstTexture,
                              geometryProcessor.get(),
                              stages.get(),
                              numColorStages,
                              numCoverageStages,
                              currAttribIndex,
                              drawType)) {
             return false;
         }
 
-        SkAutoTUnref<GrOptDrawState> optState(this->getDrawState().createOptState(*this->caps()));
+        SkAutoTUnref<GrOptDrawState> optState(GrOptDrawState::Create(this->getDrawState(),
+                                                                     *this->caps(),
+                                                                     drawType));
         SkAutoTUnref<GrGLProgram> program(GrGLProgram::Create(this,
                                                               *optState.get(),
                                                               pdesc,
                                                               geometryProcessor.get(),
                                                               stages,
                                                               stages + numColorStages));
         for (int s = 0; s < numStages; ++s) {
             SkDELETE(stages[s]);
         }
         if (NULL == program.get()) {
@@ skipping 42 matching lines @@
         SkRect::MakeWH(SK_Scalar1, SK_Scalar1), SK_Scalar1));
     GrConfigConversionEffect::Create(NULL,
                                      false,
                                      GrConfigConversionEffect::kNone_PMConversion,
                                      SkMatrix::I());
     SkScalar matrix[20];
     SkAutoTUnref<SkColorMatrixFilter> cmf(SkColorMatrixFilter::Create(matrix));
 }
 
 #endif