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

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

Issue 1409053003: skia: Make the validate match interface for *_draw_instanced (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 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
« no previous file with comments | « no previous file | src/gpu/gl/GrGLInterface.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 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 GET_PROC(InvalidateFramebuffer); 310 GET_PROC(InvalidateFramebuffer);
311 GET_PROC(InvalidateSubFramebuffer); 311 GET_PROC(InvalidateSubFramebuffer);
312 GET_PROC(InvalidateTexImage); 312 GET_PROC(InvalidateTexImage);
313 GET_PROC(InvalidateTexSubImage); 313 GET_PROC(InvalidateTexSubImage);
314 } 314 }
315 315
316 if (glVer >= GR_GL_VER(4,3) || extensions.has("GL_ARB_program_interface_quer y")) { 316 if (glVer >= GR_GL_VER(4,3) || extensions.has("GL_ARB_program_interface_quer y")) {
317 GET_PROC(GetProgramResourceLocation); 317 GET_PROC(GetProgramResourceLocation);
318 } 318 }
319 319
320 if (glVer >= GR_GL_VER(3,1) || extensions.has("GL_ARB_draw_instanced")) { 320 if (glVer >= GR_GL_VER(3,1) || extensions.has("GL_ARB_draw_instanced") ||
321 extensions.has("GL_EXT_draw_instanced")) {
321 GET_PROC(DrawArraysInstanced); 322 GET_PROC(DrawArraysInstanced);
322 GET_PROC(DrawElementsInstanced); 323 GET_PROC(DrawElementsInstanced);
323 } 324 }
324 325
325 if (glVer >= GR_GL_VER(3,2) || extensions.has("GL_ARB_instanced_arrays")) { 326 if (glVer >= GR_GL_VER(3,2) || extensions.has("GL_ARB_instanced_arrays")) {
326 GET_PROC(VertexAttribDivisor); 327 GET_PROC(VertexAttribDivisor);
327 } 328 }
328 329
329 if (extensions.has("GL_NV_bindless_texture")) { 330 if (extensions.has("GL_NV_bindless_texture")) {
330 GET_PROC_SUFFIX(GetTextureHandle, NV); 331 GET_PROC_SUFFIX(GetTextureHandle, NV);
(...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after
767 768
768 if (extensions.has("GL_CHROMIUM_bind_uniform_location")) { 769 if (extensions.has("GL_CHROMIUM_bind_uniform_location")) {
769 GET_PROC_SUFFIX(BindUniformLocation, CHROMIUM); 770 GET_PROC_SUFFIX(BindUniformLocation, CHROMIUM);
770 } 771 }
771 772
772 interface->fStandard = kGLES_GrGLStandard; 773 interface->fStandard = kGLES_GrGLStandard;
773 interface->fExtensions.swap(&extensions); 774 interface->fExtensions.swap(&extensions);
774 775
775 return interface; 776 return interface;
776 } 777 }
OLDNEW
« no previous file with comments | « no previous file | src/gpu/gl/GrGLInterface.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698