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

Side by Side Diff: src/gpu/gl/GrGLAssembleInterface.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/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
253 GET_PROC(VertexAttribPointer); 249 GET_PROC(VertexAttribPointer);
254 GET_PROC(Viewport); 250 GET_PROC(Viewport);
255 GET_PROC(BindFragDataLocationIndexed); 251 GET_PROC(BindFragDataLocationIndexed);
256 252
257 if (glVer >= GR_GL_VER(3,0) || extensions.has("GL_ARB_vertex_array_object")) { 253 if (glVer >= GR_GL_VER(3,0) || extensions.has("GL_ARB_vertex_array_object")) {
258 // no ARB suffix for GL_ARB_vertex_array_object 254 // no ARB suffix for GL_ARB_vertex_array_object
259 GET_PROC(BindVertexArray); 255 GET_PROC(BindVertexArray);
260 GET_PROC(GenVertexArrays); 256 GET_PROC(GenVertexArrays);
261 GET_PROC(DeleteVertexArrays); 257 GET_PROC(DeleteVertexArrays);
262 } else if (extensions.has("GL_APPLE_vertex_array_object")) { 258 } else if (extensions.has("GL_APPLE_vertex_array_object")) {
(...skipping 412 matching lines...) Expand 10 before | Expand all | Expand 10 after
675 GET_PROC(VertexAttrib2fv); 671 GET_PROC(VertexAttrib2fv);
676 GET_PROC(VertexAttrib3fv); 672 GET_PROC(VertexAttrib3fv);
677 GET_PROC(VertexAttrib4fv); 673 GET_PROC(VertexAttrib4fv);
678 674
679 if (version >= GR_GL_VER(3,0)) { 675 if (version >= GR_GL_VER(3,0)) {
680 GET_PROC(VertexAttribDivisor); 676 GET_PROC(VertexAttribDivisor);
681 } else if (extensions.has("GL_EXT_instanced_arrays")) { 677 } else if (extensions.has("GL_EXT_instanced_arrays")) {
682 GET_PROC_SUFFIX(VertexAttribDivisor, EXT); 678 GET_PROC_SUFFIX(VertexAttribDivisor, EXT);
683 } 679 }
684 680
685 if (version >= GR_GL_VER(3,0)) {
686 GET_PROC(VertexAttribIPointer);
687 }
688
689 GET_PROC(VertexAttribPointer); 681 GET_PROC(VertexAttribPointer);
690 GET_PROC(Viewport); 682 GET_PROC(Viewport);
691 GET_PROC(BindFramebuffer); 683 GET_PROC(BindFramebuffer);
692 GET_PROC(BindRenderbuffer); 684 GET_PROC(BindRenderbuffer);
693 GET_PROC(CheckFramebufferStatus); 685 GET_PROC(CheckFramebufferStatus);
694 GET_PROC(DeleteFramebuffers); 686 GET_PROC(DeleteFramebuffers);
695 GET_PROC(DeleteRenderbuffers); 687 GET_PROC(DeleteRenderbuffers);
696 GET_PROC(FramebufferRenderbuffer); 688 GET_PROC(FramebufferRenderbuffer);
697 GET_PROC(FramebufferTexture2D); 689 GET_PROC(FramebufferTexture2D);
698 690
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
868 if (extensions.has("EGL_KHR_image") || extensions.has("EGL_KHR_image_base")) { 860 if (extensions.has("EGL_KHR_image") || extensions.has("EGL_KHR_image_base")) {
869 GET_EGL_PROC_SUFFIX(CreateImage, KHR); 861 GET_EGL_PROC_SUFFIX(CreateImage, KHR);
870 GET_EGL_PROC_SUFFIX(DestroyImage, KHR); 862 GET_EGL_PROC_SUFFIX(DestroyImage, KHR);
871 } 863 }
872 864
873 interface->fStandard = kGLES_GrGLStandard; 865 interface->fStandard = kGLES_GrGLStandard;
874 interface->fExtensions.swap(&extensions); 866 interface->fExtensions.swap(&extensions);
875 867
876 return interface; 868 return interface;
877 } 869 }
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