| OLD | NEW | 
|     1 /* |     1 /* | 
|     2  * Copyright 2011 Google Inc. |     2  * Copyright 2011 Google Inc. | 
|     3  * |     3  * | 
|     4  * Use of this source code is governed by a BSD-style license that can be |     4  * Use of this source code is governed by a BSD-style license that can be | 
|     5  * found in the LICENSE file. |     5  * found in the LICENSE file. | 
|     6  */ |     6  */ | 
|     7  |     7  | 
|     8  |     8  | 
|     9 #include "GrGLGpu.h" |     9 #include "GrGLGpu.h" | 
|    10 #include "GrGLStencilBuffer.h" |    10 #include "GrGLStencilBuffer.h" | 
| (...skipping 1351 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  1362     if (blendInfo.fWriteColor) { |  1362     if (blendInfo.fWriteColor) { | 
|  1363         this->flushBlend(blendInfo); |  1363         this->flushBlend(blendInfo); | 
|  1364     } |  1364     } | 
|  1365  |  1365  | 
|  1366     fCurrentProgram->setData(*args.fPrimitiveProcessor, optState, *args.fBatchTr
      acker); |  1366     fCurrentProgram->setData(*args.fPrimitiveProcessor, optState, *args.fBatchTr
      acker); | 
|  1367  |  1367  | 
|  1368     GrGLRenderTarget* glRT = static_cast<GrGLRenderTarget*>(optState.getRenderTa
      rget()); |  1368     GrGLRenderTarget* glRT = static_cast<GrGLRenderTarget*>(optState.getRenderTa
      rget()); | 
|  1369     this->flushStencil(optState.getStencil()); |  1369     this->flushStencil(optState.getStencil()); | 
|  1370     this->flushScissor(optState.getScissorState(), glRT->getViewport(), glRT->or
      igin()); |  1370     this->flushScissor(optState.getScissorState(), glRT->getViewport(), glRT->or
      igin()); | 
|  1371     this->flushHWAAState(glRT, optState.isHWAntialiasState(), |  1371     this->flushHWAAState(glRT, optState.isHWAntialiasState(), | 
|  1372                          kDrawLines_DrawType == optState.drawType()); |  1372                          kDrawLines_DrawType == args.fDrawType); | 
|  1373  |  1373  | 
|  1374     // This must come after textures are flushed because a texture may need |  1374     // This must come after textures are flushed because a texture may need | 
|  1375     // to be msaa-resolved (which will modify bound FBO state). |  1375     // to be msaa-resolved (which will modify bound FBO state). | 
|  1376     this->flushRenderTarget(glRT, NULL); |  1376     this->flushRenderTarget(glRT, NULL); | 
|  1377  |  1377  | 
|  1378     return true; |  1378     return true; | 
|  1379 } |  1379 } | 
|  1380  |  1380  | 
|  1381 void GrGLGpu::setupGeometry(const GrPrimitiveProcessor& primProc, |  1381 void GrGLGpu::setupGeometry(const GrPrimitiveProcessor& primProc, | 
|  1382                             const GrDrawTarget::DrawInfo& info, |  1382                             const GrDrawTarget::DrawInfo& info, | 
| (...skipping 1362 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  2745             this->setVertexArrayID(gpu, 0); |  2745             this->setVertexArrayID(gpu, 0); | 
|  2746         } |  2746         } | 
|  2747         int attrCount = gpu->glCaps().maxVertexAttributes(); |  2747         int attrCount = gpu->glCaps().maxVertexAttributes(); | 
|  2748         if (fDefaultVertexArrayAttribState.count() != attrCount) { |  2748         if (fDefaultVertexArrayAttribState.count() != attrCount) { | 
|  2749             fDefaultVertexArrayAttribState.resize(attrCount); |  2749             fDefaultVertexArrayAttribState.resize(attrCount); | 
|  2750         } |  2750         } | 
|  2751         attribState = &fDefaultVertexArrayAttribState; |  2751         attribState = &fDefaultVertexArrayAttribState; | 
|  2752     } |  2752     } | 
|  2753     return attribState; |  2753     return attribState; | 
|  2754 } |  2754 } | 
| OLD | NEW |