Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(215)

Side by Side Diff: src/gpu/gl/GrGpuGL.cpp

Issue 27933002: More clang warning fixes. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: trybot fixes Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « src/gpu/GrContext.cpp ('k') | tests/BlitRowTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "GrGLPath.h" 11 #include "GrGLPath.h"
12 #include "GrGLShaderBuilder.h" 12 #include "GrGLShaderBuilder.h"
13 #include "GrTemplates.h" 13 #include "GrTemplates.h"
14 #include "GrTypes.h" 14 #include "GrTypes.h"
15 #include "SkStrokeRec.h" 15 #include "SkStrokeRec.h"
16 #include "SkTemplates.h" 16 #include "SkTemplates.h"
17 17
18 static const GrGLuint GR_MAX_GLUINT = ~0U;
19 static const GrGLint GR_INVAL_GLINT = ~0;
20
21 #define GL_CALL(X) GR_GL_CALL(this->glInterface(), X) 18 #define GL_CALL(X) GR_GL_CALL(this->glInterface(), X)
22 #define GL_CALL_RET(RET, X) GR_GL_CALL_RET(this->glInterface(), RET, X) 19 #define GL_CALL_RET(RET, X) GR_GL_CALL_RET(this->glInterface(), RET, X)
23 20
24
25 #define SKIP_CACHE_CHECK true 21 #define SKIP_CACHE_CHECK true
26 22
27 #if GR_GL_CHECK_ALLOC_WITH_GET_ERROR 23 #if GR_GL_CHECK_ALLOC_WITH_GET_ERROR
28 #define CLEAR_ERROR_BEFORE_ALLOC(iface) GrGLClearErr(iface) 24 #define CLEAR_ERROR_BEFORE_ALLOC(iface) GrGLClearErr(iface)
29 #define GL_ALLOC_CALL(iface, call) GR_GL_CALL_NOERRCHECK(iface, call) 25 #define GL_ALLOC_CALL(iface, call) GR_GL_CALL_NOERRCHECK(iface, call)
30 #define CHECK_ALLOC_ERROR(iface) GR_GL_GET_ERROR(iface) 26 #define CHECK_ALLOC_ERROR(iface) GR_GL_GET_ERROR(iface)
31 #else 27 #else
32 #define CLEAR_ERROR_BEFORE_ALLOC(iface) 28 #define CLEAR_ERROR_BEFORE_ALLOC(iface)
33 #define GL_ALLOC_CALL(iface, call) GR_GL_CALL(iface, call) 29 #define GL_ALLOC_CALL(iface, call) GR_GL_CALL(iface, call)
34 #define CHECK_ALLOC_ERROR(iface) GR_GL_NO_ERROR 30 #define CHECK_ALLOC_ERROR(iface) GR_GL_NO_ERROR
(...skipping 2640 matching lines...) Expand 10 before | Expand all | Expand 10 after
2675 this->setVertexArrayID(gpu, 0); 2671 this->setVertexArrayID(gpu, 0);
2676 } 2672 }
2677 int attrCount = gpu->glCaps().maxVertexAttributes(); 2673 int attrCount = gpu->glCaps().maxVertexAttributes();
2678 if (fDefaultVertexArrayAttribState.count() != attrCount) { 2674 if (fDefaultVertexArrayAttribState.count() != attrCount) {
2679 fDefaultVertexArrayAttribState.resize(attrCount); 2675 fDefaultVertexArrayAttribState.resize(attrCount);
2680 } 2676 }
2681 attribState = &fDefaultVertexArrayAttribState; 2677 attribState = &fDefaultVertexArrayAttribState;
2682 } 2678 }
2683 return attribState; 2679 return attribState;
2684 } 2680 }
OLDNEW
« no previous file with comments | « src/gpu/GrContext.cpp ('k') | tests/BlitRowTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698