cleanup reentrance logic in CMM

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 310 matching lines @@
 }
 
 static void set_random_hints(GrGpuGL* gpu, SkRandom* random) {
     for (int i = 1; i <= GrDrawState::kLast_Hint; i <<= 1) {
         gpu->drawState()->setHint(GrDrawState::Hints(i), random->nextBool());
     }
 }
 
 static void set_random_state(GrGpuGL* gpu, SkRandom* random) {
     int state = 0;
-    for (int i = 1; i <= GrDrawState::kLastPublicStateBit; i <<= 1) {
+    for (int i = 1; i <= GrDrawState::kLast_StateBit; i <<= 1) {
         state |= random->nextBool() * i;
     }
     gpu->drawState()->enableState(state);
 }
 
 // this function will randomly pick non-self referencing blend modes
 static void set_random_blend_func(GrGpuGL* gpu, SkRandom* random) {
     GrBlendCoeff src;
     do {
         src = GrBlendCoeff(random->nextRangeU(kFirstPublicGrBlendCoeff, kLastPublicGrBlendCoeff));
@@ skipping 164 matching lines @@
             if (type == GrContextFactory::kANGLE_GLContextType) {
                 maxStages = 3;
             }
 #endif
             REPORTER_ASSERT(reporter, gpu->programUnitTest(maxStages));
         }
     }
 }
 
 #endif