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

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

Issue 1669853002: Improve GLSL integer support (Closed) Base URL: https://skia.googlesource.com/skia.git@uploat_dratindirect
Patch Set: rebase 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/GrCaps.cpp ('k') | src/gpu/gl/GrGLCaps.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 /* 2 /*
3 * Copyright 2014 Google Inc. 3 * Copyright 2014 Google Inc.
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 9
10 #include "GrGLAssembleInterface.h" 10 #include "GrGLAssembleInterface.h"
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 GET_PROC(UseProgram); 239 GET_PROC(UseProgram);
240 GET_PROC(VertexAttrib1f); 240 GET_PROC(VertexAttrib1f);
241 GET_PROC(VertexAttrib2fv); 241 GET_PROC(VertexAttrib2fv);
242 GET_PROC(VertexAttrib3fv); 242 GET_PROC(VertexAttrib3fv);
243 GET_PROC(VertexAttrib4fv); 243 GET_PROC(VertexAttrib4fv);
244 244
245 if (glVer >= GR_GL_VER(3,2) || extensions.has("GL_ARB_instanced_arrays")) { 245 if (glVer >= GR_GL_VER(3,2) || extensions.has("GL_ARB_instanced_arrays")) {
246 GET_PROC(VertexAttribDivisor); 246 GET_PROC(VertexAttribDivisor);
247 } 247 }
248 248
249 if (glVer >= GR_GL_VER(3,0)) {
250 GET_PROC(VertexAttribIPointer);
251 }
252
249 GET_PROC(VertexAttribPointer); 253 GET_PROC(VertexAttribPointer);
250 GET_PROC(Viewport); 254 GET_PROC(Viewport);
251 GET_PROC(BindFragDataLocationIndexed); 255 GET_PROC(BindFragDataLocationIndexed);
252 256
253 if (glVer >= GR_GL_VER(3,0) || extensions.has("GL_ARB_vertex_array_object")) { 257 if (glVer >= GR_GL_VER(3,0) || extensions.has("GL_ARB_vertex_array_object")) {
254 // no ARB suffix for GL_ARB_vertex_array_object 258 // no ARB suffix for GL_ARB_vertex_array_object
255 GET_PROC(BindVertexArray); 259 GET_PROC(BindVertexArray);
256 GET_PROC(GenVertexArrays); 260 GET_PROC(GenVertexArrays);
257 GET_PROC(DeleteVertexArrays); 261 GET_PROC(DeleteVertexArrays);
258 } else if (extensions.has("GL_APPLE_vertex_array_object")) { 262 } else if (extensions.has("GL_APPLE_vertex_array_object")) {
(...skipping 412 matching lines...) Expand 10 before | Expand all | Expand 10 after
671 GET_PROC(VertexAttrib2fv); 675 GET_PROC(VertexAttrib2fv);
672 GET_PROC(VertexAttrib3fv); 676 GET_PROC(VertexAttrib3fv);
673 GET_PROC(VertexAttrib4fv); 677 GET_PROC(VertexAttrib4fv);
674 678
675 if (version >= GR_GL_VER(3,0)) { 679 if (version >= GR_GL_VER(3,0)) {
676 GET_PROC(VertexAttribDivisor); 680 GET_PROC(VertexAttribDivisor);
677 } else if (extensions.has("GL_EXT_instanced_arrays")) { 681 } else if (extensions.has("GL_EXT_instanced_arrays")) {
678 GET_PROC_SUFFIX(VertexAttribDivisor, EXT); 682 GET_PROC_SUFFIX(VertexAttribDivisor, EXT);
679 } 683 }
680 684
685 if (version >= GR_GL_VER(3,0)) {
686 GET_PROC(VertexAttribIPointer);
687 }
688
681 GET_PROC(VertexAttribPointer); 689 GET_PROC(VertexAttribPointer);
682 GET_PROC(Viewport); 690 GET_PROC(Viewport);
683 GET_PROC(BindFramebuffer); 691 GET_PROC(BindFramebuffer);
684 GET_PROC(BindRenderbuffer); 692 GET_PROC(BindRenderbuffer);
685 GET_PROC(CheckFramebufferStatus); 693 GET_PROC(CheckFramebufferStatus);
686 GET_PROC(DeleteFramebuffers); 694 GET_PROC(DeleteFramebuffers);
687 GET_PROC(DeleteRenderbuffers); 695 GET_PROC(DeleteRenderbuffers);
688 GET_PROC(FramebufferRenderbuffer); 696 GET_PROC(FramebufferRenderbuffer);
689 GET_PROC(FramebufferTexture2D); 697 GET_PROC(FramebufferTexture2D);
690 698
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
860 if (extensions.has("EGL_KHR_image") || extensions.has("EGL_KHR_image_base")) { 868 if (extensions.has("EGL_KHR_image") || extensions.has("EGL_KHR_image_base")) {
861 GET_EGL_PROC_SUFFIX(CreateImage, KHR); 869 GET_EGL_PROC_SUFFIX(CreateImage, KHR);
862 GET_EGL_PROC_SUFFIX(DestroyImage, KHR); 870 GET_EGL_PROC_SUFFIX(DestroyImage, KHR);
863 } 871 }
864 872
865 interface->fStandard = kGLES_GrGLStandard; 873 interface->fStandard = kGLES_GrGLStandard;
866 interface->fExtensions.swap(&extensions); 874 interface->fExtensions.swap(&extensions);
867 875
868 return interface; 876 return interface;
869 } 877 }
OLDNEW
« no previous file with comments | « src/gpu/GrCaps.cpp ('k') | src/gpu/gl/GrGLCaps.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698