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

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

Issue 22842008: Add validation check that linewidth func is present (we already call it on ES). (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Created 7 years, 4 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 | « no previous file | no next file » | 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 "gl/GrGLInterface.h" 9 #include "gl/GrGLInterface.h"
10 #include "gl/GrGLExtensions.h" 10 #include "gl/GrGLExtensions.h"
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 #endif 83 #endif
84 NULL == fGetError || 84 NULL == fGetError ||
85 NULL == fGetIntegerv || 85 NULL == fGetIntegerv ||
86 NULL == fGetProgramInfoLog || 86 NULL == fGetProgramInfoLog ||
87 NULL == fGetProgramiv || 87 NULL == fGetProgramiv ||
88 NULL == fGetShaderInfoLog || 88 NULL == fGetShaderInfoLog ||
89 NULL == fGetShaderiv || 89 NULL == fGetShaderiv ||
90 NULL == fGetString || 90 NULL == fGetString ||
91 NULL == fGetUniformLocation || 91 NULL == fGetUniformLocation ||
92 NULL == fLinkProgram || 92 NULL == fLinkProgram ||
93 NULL == fLineWidth ||
93 NULL == fPixelStorei || 94 NULL == fPixelStorei ||
94 NULL == fReadPixels || 95 NULL == fReadPixels ||
95 NULL == fScissor || 96 NULL == fScissor ||
96 NULL == fShaderSource || 97 NULL == fShaderSource ||
97 NULL == fStencilFunc || 98 NULL == fStencilFunc ||
98 NULL == fStencilMask || 99 NULL == fStencilMask ||
99 NULL == fStencilOp || 100 NULL == fStencilOp ||
100 NULL == fTexImage2D || 101 NULL == fTexImage2D ||
101 NULL == fTexParameteri || 102 NULL == fTexParameteri ||
102 NULL == fTexParameteriv || 103 NULL == fTexParameteriv ||
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 if (kDesktop_GrGLBinding != binding || 267 if (kDesktop_GrGLBinding != binding ||
267 (glVer >= GR_GL_VER(1,3)) || 268 (glVer >= GR_GL_VER(1,3)) ||
268 extensions.has("GL_ARB_texture_compression")) { 269 extensions.has("GL_ARB_texture_compression")) {
269 if (NULL == fCompressedTexImage2D) { 270 if (NULL == fCompressedTexImage2D) {
270 return false; 271 return false;
271 } 272 }
272 } 273 }
273 274
274 // part of desktop GL, but not ES 275 // part of desktop GL, but not ES
275 if (kDesktop_GrGLBinding == binding && 276 if (kDesktop_GrGLBinding == binding &&
276 (NULL == fLineWidth || 277 (NULL == fGetTexLevelParameteriv ||
277 NULL == fGetTexLevelParameteriv ||
278 NULL == fDrawBuffer || 278 NULL == fDrawBuffer ||
279 NULL == fReadBuffer)) { 279 NULL == fReadBuffer)) {
280 return false; 280 return false;
281 } 281 }
282 282
283 // GL_EXT_texture_storage is part of desktop 4.2 283 // GL_EXT_texture_storage is part of desktop 4.2
284 // There is a desktop ARB extension and an ES+desktop EXT extension 284 // There is a desktop ARB extension and an ES+desktop EXT extension
285 if (kDesktop_GrGLBinding == binding) { 285 if (kDesktop_GrGLBinding == binding) {
286 if (glVer >= GR_GL_VER(4,2) || 286 if (glVer >= GR_GL_VER(4,2) ||
287 extensions.has("GL_ARB_texture_storage") || 287 extensions.has("GL_ARB_texture_storage") ||
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
382 if (NULL == fBindVertexArray || 382 if (NULL == fBindVertexArray ||
383 NULL == fDeleteVertexArrays || 383 NULL == fDeleteVertexArrays ||
384 NULL == fGenVertexArrays) { 384 NULL == fGenVertexArrays) {
385 return false; 385 return false;
386 } 386 }
387 } 387 }
388 } 388 }
389 389
390 return true; 390 return true;
391 } 391 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698