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

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

Issue 1415503008: Fix setColocatedSampleLocations on ES and GL < 4.5 (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
« src/gpu/gl/GrGLGpu.cpp ('K') | « src/gpu/gl/GrGLGpu.cpp ('k') | no next file » | 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 695 matching lines...) Expand 10 before | Expand all | Expand 10 after
706 nullptr == fFunctions.fGetVertexArrayPointerv || 706 nullptr == fFunctions.fGetVertexArrayPointerv ||
707 nullptr == fFunctions.fGetVertexArrayIntegeri_v || 707 nullptr == fFunctions.fGetVertexArrayIntegeri_v ||
708 nullptr == fFunctions.fGetVertexArrayPointeri_v || 708 nullptr == fFunctions.fGetVertexArrayPointeri_v ||
709 nullptr == fFunctions.fMapNamedBufferRange || 709 nullptr == fFunctions.fMapNamedBufferRange ||
710 nullptr == fFunctions.fFlushMappedNamedBufferRange) { 710 nullptr == fFunctions.fFlushMappedNamedBufferRange) {
711 RETURN_FALSE_INTERFACE 711 RETURN_FALSE_INTERFACE
712 } 712 }
713 } 713 }
714 } 714 }
715 715
716 if ((kGL_GrGLStandard == fStandard && glVer >= GR_GL_VER(4,3)) ||
717 (kGLES_GrGLStandard == fStandard && glVer >= GR_GL_VER(3,1)) ||
718 fExtensions.has("GL_NV_sample_locations") ||
bsalomon 2015/11/03 15:21:12 Here you check for the extensions but not in the i
Chris Dalton 2015/11/03 15:49:15 Yeah this check was a little OCD. glFramebufferPar
bsalomon 2015/11/03 15:54:22 I suppose if a vendor shipped an ES 3.0 with the e
719 fExtensions.has("GL_ARB_sample_locations")) {
720 if (nullptr == fFunctions.fFramebufferParameteri) {
721 RETURN_FALSE_INTERFACE
722 }
723 }
724
716 if (kGL_GrGLStandard == fStandard && glVer >= GR_GL_VER(4,5)) { 725 if (kGL_GrGLStandard == fStandard && glVer >= GR_GL_VER(4,5)) {
717 if (nullptr == fFunctions.fNamedFramebufferParameteri) { 726 if (nullptr == fFunctions.fNamedFramebufferParameteri) {
718 RETURN_FALSE_INTERFACE 727 RETURN_FALSE_INTERFACE
719 } 728 }
720 } 729 }
721 730
722 if ((kGL_GrGLStandard == fStandard && glVer >= GR_GL_VER(4,3)) || 731 if ((kGL_GrGLStandard == fStandard && glVer >= GR_GL_VER(4,3)) ||
723 fExtensions.has("GL_KHR_debug")) { 732 fExtensions.has("GL_KHR_debug")) {
724 if (nullptr == fFunctions.fDebugMessageControl || 733 if (nullptr == fFunctions.fDebugMessageControl ||
725 nullptr == fFunctions.fDebugMessageInsert || 734 nullptr == fFunctions.fDebugMessageInsert ||
726 nullptr == fFunctions.fDebugMessageCallback || 735 nullptr == fFunctions.fDebugMessageCallback ||
727 nullptr == fFunctions.fGetDebugMessageLog || 736 nullptr == fFunctions.fGetDebugMessageLog ||
728 nullptr == fFunctions.fPushDebugGroup || 737 nullptr == fFunctions.fPushDebugGroup ||
729 nullptr == fFunctions.fPopDebugGroup || 738 nullptr == fFunctions.fPopDebugGroup ||
730 nullptr == fFunctions.fObjectLabel) { 739 nullptr == fFunctions.fObjectLabel) {
731 RETURN_FALSE_INTERFACE 740 RETURN_FALSE_INTERFACE
732 } 741 }
733 } 742 }
734 743
735 return true; 744 return true;
736 } 745 }
OLDNEW
« src/gpu/gl/GrGLGpu.cpp ('K') | « src/gpu/gl/GrGLGpu.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698