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

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

Issue 1420883007: Revert of Fix setColocatedSampleLocations on ES and GL < 4.5 (patchset #2 id:20001 of https://coder… (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 1 month 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 | « include/gpu/gl/GrGLInterface.h ('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 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 } 262 }
263 if (extensions.has("GL_EXT_framebuffer_blit")) { 263 if (extensions.has("GL_EXT_framebuffer_blit")) {
264 GET_PROC_SUFFIX(BlitFramebuffer, EXT); 264 GET_PROC_SUFFIX(BlitFramebuffer, EXT);
265 } 265 }
266 } else { 266 } else {
267 // we must have FBOs 267 // we must have FBOs
268 delete interface; 268 delete interface;
269 return nullptr; 269 return nullptr;
270 } 270 }
271 271
272 if (glVer >= GR_GL_VER(4,3)) {
273 GET_PROC(FramebufferParameteri);
274 }
275
276 if (extensions.has("GL_NV_path_rendering")) { 272 if (extensions.has("GL_NV_path_rendering")) {
277 GET_PROC_SUFFIX(MatrixLoadf, EXT); 273 GET_PROC_SUFFIX(MatrixLoadf, EXT);
278 GET_PROC_SUFFIX(MatrixLoadIdentity, EXT); 274 GET_PROC_SUFFIX(MatrixLoadIdentity, EXT);
279 GET_PROC_SUFFIX(PathCommands, NV); 275 GET_PROC_SUFFIX(PathCommands, NV);
280 GET_PROC_SUFFIX(PathParameteri, NV); 276 GET_PROC_SUFFIX(PathParameteri, NV);
281 GET_PROC_SUFFIX(PathParameterf, NV); 277 GET_PROC_SUFFIX(PathParameterf, NV);
282 GET_PROC_SUFFIX(GenPaths, NV); 278 GET_PROC_SUFFIX(GenPaths, NV);
283 GET_PROC_SUFFIX(DeletePaths, NV); 279 GET_PROC_SUFFIX(DeletePaths, NV);
284 GET_PROC_SUFFIX(IsPath, NV); 280 GET_PROC_SUFFIX(IsPath, NV);
285 GET_PROC_SUFFIX(PathStencilFunc, NV); 281 GET_PROC_SUFFIX(PathStencilFunc, NV);
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
621 GET_PROC(VertexAttrib2fv); 617 GET_PROC(VertexAttrib2fv);
622 GET_PROC(VertexAttrib3fv); 618 GET_PROC(VertexAttrib3fv);
623 GET_PROC(VertexAttrib4fv); 619 GET_PROC(VertexAttrib4fv);
624 GET_PROC(VertexAttribPointer); 620 GET_PROC(VertexAttribPointer);
625 GET_PROC(Viewport); 621 GET_PROC(Viewport);
626 GET_PROC(BindFramebuffer); 622 GET_PROC(BindFramebuffer);
627 GET_PROC(BindRenderbuffer); 623 GET_PROC(BindRenderbuffer);
628 GET_PROC(CheckFramebufferStatus); 624 GET_PROC(CheckFramebufferStatus);
629 GET_PROC(DeleteFramebuffers); 625 GET_PROC(DeleteFramebuffers);
630 GET_PROC(DeleteRenderbuffers); 626 GET_PROC(DeleteRenderbuffers);
631
632 if (version >= GR_GL_VER(3,1)) {
633 GET_PROC(FramebufferParameteri);
634 }
635
636 GET_PROC(FramebufferRenderbuffer); 627 GET_PROC(FramebufferRenderbuffer);
637 GET_PROC(FramebufferTexture2D); 628 GET_PROC(FramebufferTexture2D);
638 629
639 if (extensions.has("GL_CHROMIUM_framebuffer_multisample")) { 630 if (extensions.has("GL_CHROMIUM_framebuffer_multisample")) {
640 GET_PROC_SUFFIX(RenderbufferStorageMultisample, CHROMIUM); 631 GET_PROC_SUFFIX(RenderbufferStorageMultisample, CHROMIUM);
641 GET_PROC_SUFFIX(BlitFramebuffer, CHROMIUM); 632 GET_PROC_SUFFIX(BlitFramebuffer, CHROMIUM);
642 } else if (version >= GR_GL_VER(3,0)) { 633 } else if (version >= GR_GL_VER(3,0)) {
643 GET_PROC(RenderbufferStorageMultisample); 634 GET_PROC(RenderbufferStorageMultisample);
644 GET_PROC(BlitFramebuffer); 635 GET_PROC(BlitFramebuffer);
645 } 636 }
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
777 768
778 if (extensions.has("GL_CHROMIUM_bind_uniform_location")) { 769 if (extensions.has("GL_CHROMIUM_bind_uniform_location")) {
779 GET_PROC_SUFFIX(BindUniformLocation, CHROMIUM); 770 GET_PROC_SUFFIX(BindUniformLocation, CHROMIUM);
780 } 771 }
781 772
782 interface->fStandard = kGLES_GrGLStandard; 773 interface->fStandard = kGLES_GrGLStandard;
783 interface->fExtensions.swap(&extensions); 774 interface->fExtensions.swap(&extensions);
784 775
785 return interface; 776 return interface;
786 } 777 }
OLDNEW
« no previous file with comments | « include/gpu/gl/GrGLInterface.h ('k') | src/gpu/gl/GrGLCaps.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698