| 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 "GrGpuGL.h" | 9 #include "GrGpuGL.h" | 
| 10 #include "GrGLStencilBuffer.h" | 10 #include "GrGLStencilBuffer.h" | 
|  | 11 #include "GrOptDrawState.h" | 
| 11 #include "GrTemplates.h" | 12 #include "GrTemplates.h" | 
| 12 #include "GrTypes.h" | 13 #include "GrTypes.h" | 
| 13 #include "SkStrokeRec.h" | 14 #include "SkStrokeRec.h" | 
| 14 #include "SkTemplates.h" | 15 #include "SkTemplates.h" | 
| 15 | 16 | 
| 16 #define GL_CALL(X) GR_GL_CALL(this->glInterface(), X) | 17 #define GL_CALL(X) GR_GL_CALL(this->glInterface(), X) | 
| 17 #define GL_CALL_RET(RET, X) GR_GL_CALL_RET(this->glInterface(), RET, X) | 18 #define GL_CALL_RET(RET, X) GR_GL_CALL_RET(this->glInterface(), RET, X) | 
| 18 | 19 | 
| 19 #define SKIP_CACHE_CHECK    true | 20 #define SKIP_CACHE_CHECK    true | 
| 20 | 21 | 
| (...skipping 2574 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2595             this->setVertexArrayID(gpu, 0); | 2596             this->setVertexArrayID(gpu, 0); | 
| 2596         } | 2597         } | 
| 2597         int attrCount = gpu->glCaps().maxVertexAttributes(); | 2598         int attrCount = gpu->glCaps().maxVertexAttributes(); | 
| 2598         if (fDefaultVertexArrayAttribState.count() != attrCount) { | 2599         if (fDefaultVertexArrayAttribState.count() != attrCount) { | 
| 2599             fDefaultVertexArrayAttribState.resize(attrCount); | 2600             fDefaultVertexArrayAttribState.resize(attrCount); | 
| 2600         } | 2601         } | 
| 2601         attribState = &fDefaultVertexArrayAttribState; | 2602         attribState = &fDefaultVertexArrayAttribState; | 
| 2602     } | 2603     } | 
| 2603     return attribState; | 2604     return attribState; | 
| 2604 } | 2605 } | 
| OLD | NEW | 
|---|