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

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

Issue 1645013002: Revert "Enable GL_CHROMIUM_bind_uniform_location, command buffer is fixed" (Closed) Base URL: https://skia.googlesource.com/skia.git@master
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 | « no previous file | 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 2012 Google Inc. 2 * Copyright 2012 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 "GrGLCaps.h" 9 #include "GrGLCaps.h"
10 10
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 if (kGL_GrGLStandard == standard) { 200 if (kGL_GrGLStandard == standard) {
201 if (version >= GR_GL_VER(3, 0)) { 201 if (version >= GR_GL_VER(3, 0)) {
202 fBindFragDataLocationSupport = true; 202 fBindFragDataLocationSupport = true;
203 } 203 }
204 } else { 204 } else {
205 if (version >= GR_GL_VER(3, 0) && ctxInfo.hasExtension("GL_EXT_blend_fun c_extended")) { 205 if (version >= GR_GL_VER(3, 0) && ctxInfo.hasExtension("GL_EXT_blend_fun c_extended")) {
206 fBindFragDataLocationSupport = true; 206 fBindFragDataLocationSupport = true;
207 } 207 }
208 } 208 }
209 209
210 #if 0 // Disabled due to https://bug.skia.org/4454
210 fBindUniformLocationSupport = ctxInfo.hasExtension("GL_CHROMIUM_bind_uniform _location"); 211 fBindUniformLocationSupport = ctxInfo.hasExtension("GL_CHROMIUM_bind_uniform _location");
212 #else
213 fBindUniformLocationSupport = false;
214 #endif
211 215
212 if (ctxInfo.hasExtension("GL_OES_EGL_image_external")) { 216 if (ctxInfo.hasExtension("GL_OES_EGL_image_external")) {
213 if (ctxInfo.glslGeneration() == k110_GrGLSLGeneration) { 217 if (ctxInfo.glslGeneration() == k110_GrGLSLGeneration) {
214 fExternalTextureSupport = true; 218 fExternalTextureSupport = true;
215 } else if (ctxInfo.hasExtension("GL_OES_EGL_image_external_essl3") || 219 } else if (ctxInfo.hasExtension("GL_OES_EGL_image_external_essl3") ||
216 ctxInfo.hasExtension("OES_EGL_image_external_essl3")) { 220 ctxInfo.hasExtension("OES_EGL_image_external_essl3")) {
217 // At least one driver has been found that has this extension withou t the "GL_" prefix. 221 // At least one driver has been found that has this extension withou t the "GL_" prefix.
218 fExternalTextureSupport = true; 222 fExternalTextureSupport = true;
219 } 223 }
220 } 224 }
(...skipping 1400 matching lines...) Expand 10 before | Expand all | Expand 10 after
1621 for (int j = 0; j < kExternalFormatUsageCnt; ++j) { 1625 for (int j = 0; j < kExternalFormatUsageCnt; ++j) {
1622 SkASSERT(defaultEntry.fFormats.fExternalFormat[j] != 1626 SkASSERT(defaultEntry.fFormats.fExternalFormat[j] !=
1623 fConfigTable[i].fFormats.fExternalFormat[j]); 1627 fConfigTable[i].fFormats.fExternalFormat[j]);
1624 } 1628 }
1625 SkASSERT(defaultEntry.fFormats.fExternalType != fConfigTable[i].fFormats .fExternalType); 1629 SkASSERT(defaultEntry.fFormats.fExternalType != fConfigTable[i].fFormats .fExternalType);
1626 } 1630 }
1627 #endif 1631 #endif
1628 } 1632 }
1629 1633
1630 void GrGLCaps::onApplyOptionsOverrides(const GrContextOptions& options) {} 1634 void GrGLCaps::onApplyOptionsOverrides(const GrContextOptions& options) {}
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698