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

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

Issue 1674813004: Revert of Improve GLSL integer support (Closed) Base URL: https://skia.googlesource.com/skia.git@uploat_dratindirect
Patch Set: Created 4 years, 10 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
« no previous file with comments | « src/gpu/gl/GrGLGpu.cpp ('k') | src/gpu/gl/GrGLNoOpInterface.h » ('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 "gl/GrGLInterface.h" 9 #include "gl/GrGLInterface.h"
10 #include "gl/GrGLExtensions.h" 10 #include "gl/GrGLExtensions.h"
(...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 } 409 }
410 410
411 411
412 // glGetStringi was added in version 3.0 of both desktop and ES. 412 // glGetStringi was added in version 3.0 of both desktop and ES.
413 if (glVer >= GR_GL_VER(3, 0)) { 413 if (glVer >= GR_GL_VER(3, 0)) {
414 if (nullptr == fFunctions.fGetStringi) { 414 if (nullptr == fFunctions.fGetStringi) {
415 RETURN_FALSE_INTERFACE 415 RETURN_FALSE_INTERFACE
416 } 416 }
417 } 417 }
418 418
419 // glVertexAttribIPointer was added in version 3.0 of both desktop and ES.
420 if (glVer >= GR_GL_VER(3, 0)) {
421 if (NULL == fFunctions.fVertexAttribIPointer) {
422 RETURN_FALSE_INTERFACE
423 }
424 }
425
426 if (kGL_GrGLStandard == fStandard) { 419 if (kGL_GrGLStandard == fStandard) {
427 if (glVer >= GR_GL_VER(3, 0) || fExtensions.has("GL_ARB_vertex_array_obj ect")) { 420 if (glVer >= GR_GL_VER(3, 0) || fExtensions.has("GL_ARB_vertex_array_obj ect")) {
428 if (nullptr == fFunctions.fBindVertexArray || 421 if (nullptr == fFunctions.fBindVertexArray ||
429 nullptr == fFunctions.fDeleteVertexArrays || 422 nullptr == fFunctions.fDeleteVertexArrays ||
430 nullptr == fFunctions.fGenVertexArrays) { 423 nullptr == fFunctions.fGenVertexArrays) {
431 RETURN_FALSE_INTERFACE 424 RETURN_FALSE_INTERFACE
432 } 425 }
433 } 426 }
434 } else { 427 } else {
435 if (glVer >= GR_GL_VER(3,0) || fExtensions.has("GL_OES_vertex_array_obje ct")) { 428 if (glVer >= GR_GL_VER(3,0) || fExtensions.has("GL_OES_vertex_array_obje ct")) {
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
755 748
756 if (fExtensions.has("EGL_KHR_image") || fExtensions.has("EGL_KHR_image_base" )) { 749 if (fExtensions.has("EGL_KHR_image") || fExtensions.has("EGL_KHR_image_base" )) {
757 if (nullptr == fFunctions.fEGLCreateImage || 750 if (nullptr == fFunctions.fEGLCreateImage ||
758 nullptr == fFunctions.fEGLDestroyImage) { 751 nullptr == fFunctions.fEGLDestroyImage) {
759 RETURN_FALSE_INTERFACE 752 RETURN_FALSE_INTERFACE
760 } 753 }
761 } 754 }
762 755
763 return true; 756 return true;
764 } 757 }
OLDNEW
« no previous file with comments | « src/gpu/gl/GrGLGpu.cpp ('k') | src/gpu/gl/GrGLNoOpInterface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698