Eliminate special case nvpr batch handling

src/gpu/GrStencilSettings.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.
  */
 
 
 #include "GrStencilSettings.h"
 
@@ skipping 152 matching lines @@
 GR_STATIC_ASSERT(9 == (int)GrUserStencilOp::kSetClipBit);
 GR_STATIC_ASSERT(10 == (int)GrUserStencilOp::kInvertClipBit);
 GR_STATIC_ASSERT(11 == (int)GrUserStencilOp::kSetClipAndReplaceUserBits);
 GR_STATIC_ASSERT(12 == (int)GrUserStencilOp::kZeroClipAndUserBits);
 
 void GrStencilSettings::Face::reset(const GrUserStencilSettings::Face& user, bool hasStencilClip,
                                     int numStencilBits) {
     SkASSERT(user.fTest < (GrUserStencilTest)kGrUserStencilTestCount);
     SkASSERT(user.fPassOp < (GrUserStencilOp)kGrUserStencilOpCount);
     SkASSERT(user.fFailOp < (GrUserStencilOp)kGrUserStencilOpCount);
-    SkASSERT(numStencilBits <= 16);
+    SkASSERT(numStencilBits > 0 && numStencilBits <= 16);
     int clipBit = 1 << (numStencilBits - 1);
     int userMask = clipBit - 1;
 
     GrUserStencilOp maxOp = SkTMax(user.fPassOp, user.fFailOp);
     SkDEBUGCODE(GrUserStencilOp otherOp = SkTMin(user.fPassOp, user.fFailOp);)
     if (maxOp <= kLastUserOnlyStencilOp) {
         // Ops that only modify user bits.
         fWriteMask = user.fWriteMask & userMask;
         SkASSERT(otherOp <= kLastUserOnlyStencilOp);
     } else if (maxOp <= kLastClipOnlyStencilOp) {
@@ skipping 296 matching lines @@
     GR_STATIC_ASSERT(4 == offsetof(Face, fTestMask));
     GR_STATIC_ASSERT(2 == sizeof(Face::fTestMask));
     GR_STATIC_ASSERT(6 == offsetof(Face, fPassOp));
     GR_STATIC_ASSERT(1 == sizeof(Face::fPassOp));
     GR_STATIC_ASSERT(7 == offsetof(Face, fFailOp));
     GR_STATIC_ASSERT(1 == sizeof(Face::fFailOp));
     GR_STATIC_ASSERT(8 == offsetof(Face, fWriteMask));
     GR_STATIC_ASSERT(2 == sizeof(Face::fWriteMask));
     GR_STATIC_ASSERT(10 == sizeof(Face));
 }