scissor state on optstate

src/gpu/GrGpu.cpp

 
 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "GrGpu.h"
@@ skipping 265 matching lines @@
                                                           6,
                                                           MAX_QUADS,
                                                           4);
     }
 
     return fQuadIndexBuffer;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
-void GrGpu::draw(const GrOptDrawState& ds,
-                 const GrDrawTarget::DrawInfo& info,
-                 const GrClipMaskManager::ScissorState& scissorState) {
+void GrGpu::draw(const GrOptDrawState& ds, const GrDrawTarget::DrawInfo& info) {
     this->handleDirtyContext();
     if (!this->flushGraphicsState(ds,
                                   PrimTypeToDrawType(info.primitiveType()),
-                                  scissorState,
                                   info.getDstCopy())) {
         return;
     }
     this->onDraw(ds, info);
 }
 
 void GrGpu::stencilPath(const GrOptDrawState& ds,
                         const GrPath* path,
-                        const GrClipMaskManager::ScissorState& scissorState,
                         const GrStencilSettings& stencilSettings) {
     this->handleDirtyContext();
 
-    if (!this->flushGraphicsState(ds, kStencilPath_DrawType, scissorState, NULL)) {
+    if (!this->flushGraphicsState(ds, kStencilPath_DrawType, NULL)) {
         return;
     }
 
     this->pathRendering()->stencilPath(path, stencilSettings);
 }
 
 
 void GrGpu::drawPath(const GrOptDrawState& ds,
                      const GrPath* path,
-                     const GrClipMaskManager::ScissorState& scissorState,
                      const GrStencilSettings& stencilSettings,
                      const GrDeviceCoordTexture* dstCopy) {
     this->handleDirtyContext();
 
-    if (!this->flushGraphicsState(ds, kDrawPath_DrawType, scissorState, dstCopy)) {
+    if (!this->flushGraphicsState(ds, kDrawPath_DrawType, dstCopy)) {
         return;
     }
 
     this->pathRendering()->drawPath(path, stencilSettings);
 }
 
 void GrGpu::drawPaths(const GrOptDrawState& ds,
                       const GrPathRange* pathRange,
                       const uint32_t indices[],
                       int count,
                       const float transforms[],
                       GrDrawTarget::PathTransformType transformsType,
-                      const GrClipMaskManager::ScissorState& scissorState,
                       const GrStencilSettings& stencilSettings,
                       const GrDeviceCoordTexture* dstCopy) {
     this->handleDirtyContext();
 
-    if (!this->flushGraphicsState(ds, kDrawPaths_DrawType, scissorState, dstCopy)) {
+    if (!this->flushGraphicsState(ds, kDrawPaths_DrawType, dstCopy)) {
         return;
     }
 
     pathRange->willDrawPaths(indices, count);
     this->pathRendering()->drawPaths(pathRange, indices, count, transforms, transformsType,
                                      stencilSettings);
 }