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

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

Issue 1613763003: 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, 11 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 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 if (kGL_GrGLStandard == standard) { 197 if (kGL_GrGLStandard == standard) {
198 if (version >= GR_GL_VER(3, 0)) { 198 if (version >= GR_GL_VER(3, 0)) {
199 fBindFragDataLocationSupport = true; 199 fBindFragDataLocationSupport = true;
200 } 200 }
201 } else { 201 } else {
202 if (version >= GR_GL_VER(3, 0) && ctxInfo.hasExtension("GL_EXT_blend_fun c_extended")) { 202 if (version >= GR_GL_VER(3, 0) && ctxInfo.hasExtension("GL_EXT_blend_fun c_extended")) {
203 fBindFragDataLocationSupport = true; 203 fBindFragDataLocationSupport = true;
204 } 204 }
205 } 205 }
206 206
207 #if 0 // Disabled due to https://bug.skia.org/4454
208 fBindUniformLocationSupport = ctxInfo.hasExtension("GL_CHROMIUM_bind_uniform _location"); 207 fBindUniformLocationSupport = ctxInfo.hasExtension("GL_CHROMIUM_bind_uniform _location");
209 #else
210 fBindUniformLocationSupport = false;
211 #endif
212 208
213 if (ctxInfo.hasExtension("GL_OES_EGL_image_external")) { 209 if (ctxInfo.hasExtension("GL_OES_EGL_image_external")) {
214 if (ctxInfo.glslGeneration() == k110_GrGLSLGeneration) { 210 if (ctxInfo.glslGeneration() == k110_GrGLSLGeneration) {
215 fExternalTextureSupport = true; 211 fExternalTextureSupport = true;
216 } else if (ctxInfo.hasExtension("GL_OES_EGL_image_external_essl3") || 212 } else if (ctxInfo.hasExtension("GL_OES_EGL_image_external_essl3") ||
217 ctxInfo.hasExtension("OES_EGL_image_external_essl3")) { 213 ctxInfo.hasExtension("OES_EGL_image_external_essl3")) {
218 // At least one driver has been found that has this extension withou t the "GL_" prefix. 214 // At least one driver has been found that has this extension withou t the "GL_" prefix.
219 fExternalTextureSupport = true; 215 fExternalTextureSupport = true;
220 } 216 }
221 } 217 }
(...skipping 1364 matching lines...) Expand 10 before | Expand all | Expand 10 after
1586 for (int j = 0; j < kExternalFormatUsageCnt; ++j) { 1582 for (int j = 0; j < kExternalFormatUsageCnt; ++j) {
1587 SkASSERT(defaultEntry.fFormats.fExternalFormat[j] != 1583 SkASSERT(defaultEntry.fFormats.fExternalFormat[j] !=
1588 fConfigTable[i].fFormats.fExternalFormat[j]); 1584 fConfigTable[i].fFormats.fExternalFormat[j]);
1589 } 1585 }
1590 SkASSERT(defaultEntry.fFormats.fExternalType != fConfigTable[i].fFormats .fExternalType); 1586 SkASSERT(defaultEntry.fFormats.fExternalType != fConfigTable[i].fFormats .fExternalType);
1591 } 1587 }
1592 #endif 1588 #endif
1593 } 1589 }
1594 1590
1595 void GrGLCaps::onApplyOptionsOverrides(const GrContextOptions& options) {} 1591 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