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

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

Issue 2167303002: Reenable support for CHROMIUM_set_uniform_location (Closed) Base URL: https://chromium.googlesource.com/skia.git@master
Patch Set: Created 4 years, 5 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 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 if (kGL_GrGLStandard == standard) { 185 if (kGL_GrGLStandard == standard) {
186 if (version >= GR_GL_VER(3, 0)) { 186 if (version >= GR_GL_VER(3, 0)) {
187 fBindFragDataLocationSupport = true; 187 fBindFragDataLocationSupport = true;
188 } 188 }
189 } else { 189 } else {
190 if (version >= GR_GL_VER(3, 0) && ctxInfo.hasExtension("GL_EXT_blend_fun c_extended")) { 190 if (version >= GR_GL_VER(3, 0) && ctxInfo.hasExtension("GL_EXT_blend_fun c_extended")) {
191 fBindFragDataLocationSupport = true; 191 fBindFragDataLocationSupport = true;
192 } 192 }
193 } 193 }
194 194
195 #if 0 // Disabled due to https://bug.skia.org/4454
196 fBindUniformLocationSupport = ctxInfo.hasExtension("GL_CHROMIUM_bind_uniform _location"); 195 fBindUniformLocationSupport = ctxInfo.hasExtension("GL_CHROMIUM_bind_uniform _location");
197 #else
198 fBindUniformLocationSupport = false;
199 #endif
200 196
201 if (kGL_GrGLStandard == standard) { 197 if (kGL_GrGLStandard == standard) {
202 if (version >= GR_GL_VER(3, 1) || ctxInfo.hasExtension("GL_ARB_texture_r ectangle")) { 198 if (version >= GR_GL_VER(3, 1) || ctxInfo.hasExtension("GL_ARB_texture_r ectangle")) {
203 // We also require textureSize() support for rectangle 2D samplers w hich was added in 199 // We also require textureSize() support for rectangle 2D samplers w hich was added in
204 // GLSL 1.40. 200 // GLSL 1.40.
205 if (ctxInfo.glslGeneration() >= k140_GrGLSLGeneration) { 201 if (ctxInfo.glslGeneration() >= k140_GrGLSLGeneration) {
206 fRectangleTextureSupport = true; 202 fRectangleTextureSupport = true;
207 } 203 }
208 } 204 }
209 } else { 205 } else {
(...skipping 1723 matching lines...) Expand 10 before | Expand all | Expand 10 after
1933 for (int j = 0; j < kExternalFormatUsageCnt; ++j) { 1929 for (int j = 0; j < kExternalFormatUsageCnt; ++j) {
1934 SkASSERT(defaultEntry.fFormats.fExternalFormat[j] != 1930 SkASSERT(defaultEntry.fFormats.fExternalFormat[j] !=
1935 fConfigTable[i].fFormats.fExternalFormat[j]); 1931 fConfigTable[i].fFormats.fExternalFormat[j]);
1936 } 1932 }
1937 SkASSERT(defaultEntry.fFormats.fExternalType != fConfigTable[i].fFormats .fExternalType); 1933 SkASSERT(defaultEntry.fFormats.fExternalType != fConfigTable[i].fFormats .fExternalType);
1938 } 1934 }
1939 #endif 1935 #endif
1940 } 1936 }
1941 1937
1942 void GrGLCaps::onApplyOptionsOverrides(const GrContextOptions& options) {} 1938 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