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

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

Issue 661603009: Revert of Support GLSL es 3.00 (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 2 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 | src/gpu/gl/GrGLContext.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 * 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 #include "GrGLContext.h" 10 #include "GrGLContext.h"
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 } 192 }
193 193
194 fImagingSupport = kGL_GrGLStandard == standard && 194 fImagingSupport = kGL_GrGLStandard == standard &&
195 ctxInfo.hasExtension("GL_ARB_imaging"); 195 ctxInfo.hasExtension("GL_ARB_imaging");
196 196
197 // ES 2 only guarantees RGBA/uchar + one other format/type combo for 197 // ES 2 only guarantees RGBA/uchar + one other format/type combo for
198 // ReadPixels. The other format has to checked at run-time since it 198 // ReadPixels. The other format has to checked at run-time since it
199 // can change based on which render target is bound 199 // can change based on which render target is bound
200 fTwoFormatLimit = kGLES_GrGLStandard == standard; 200 fTwoFormatLimit = kGLES_GrGLStandard == standard;
201 201
202 // Frag Coords Convention support is not part of ES
203 // Known issue on at least some Intel platforms: 202 // Known issue on at least some Intel platforms:
204 // http://code.google.com/p/skia/issues/detail?id=946 203 // http://code.google.com/p/skia/issues/detail?id=946
205 if (kIntel_GrGLVendor != ctxInfo.vendor() && kGLES_GrGLStandard != standard) { 204 if (kIntel_GrGLVendor != ctxInfo.vendor()) {
206 fFragCoordsConventionSupport = ctxInfo.glslGeneration() >= k150_GrGLSLGe neration || 205 fFragCoordsConventionSupport = ctxInfo.glslGeneration() >= k150_GrGLSLGe neration ||
207 ctxInfo.hasExtension("GL_ARB_fragment_coo rd_conventions"); 206 ctxInfo.hasExtension("GL_ARB_fragment_coo rd_conventions");
208 } 207 }
209 208
210 // SGX and Mali GPUs that are based on a tiled-deferred architecture that ha ve trouble with 209 // SGX and Mali GPUs that are based on a tiled-deferred architecture that ha ve trouble with
211 // frequently changing VBOs. We've measured a performance increase using non -VBO vertex 210 // frequently changing VBOs. We've measured a performance increase using non -VBO vertex
212 // data for dynamic content on these GPUs. Perhaps we should read the render er string and 211 // data for dynamic content on these GPUs. Perhaps we should read the render er string and
213 // limit this decision to specific GPU families rather than basing it on the vendor alone. 212 // limit this decision to specific GPU families rather than basing it on the vendor alone.
214 if (!GR_GL_MUST_USE_VBO && 213 if (!GR_GL_MUST_USE_VBO &&
215 (kARM_GrGLVendor == ctxInfo.vendor() || 214 (kARM_GrGLVendor == ctxInfo.vendor() ||
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
362 361
363 // Enable supported shader-related caps 362 // Enable supported shader-related caps
364 if (kGL_GrGLStandard == standard) { 363 if (kGL_GrGLStandard == standard) {
365 fDualSourceBlendingSupport = ctxInfo.version() >= GR_GL_VER(3,3) || 364 fDualSourceBlendingSupport = ctxInfo.version() >= GR_GL_VER(3,3) ||
366 ctxInfo.hasExtension("GL_ARB_blend_func_ext ended"); 365 ctxInfo.hasExtension("GL_ARB_blend_func_ext ended");
367 fShaderDerivativeSupport = true; 366 fShaderDerivativeSupport = true;
368 // we don't support GL_ARB_geometry_shader4, just GL 3.2+ GS 367 // we don't support GL_ARB_geometry_shader4, just GL 3.2+ GS
369 fGeometryShaderSupport = ctxInfo.version() >= GR_GL_VER(3,2) && 368 fGeometryShaderSupport = ctxInfo.version() >= GR_GL_VER(3,2) &&
370 ctxInfo.glslGeneration() >= k150_GrGLSLGenerati on; 369 ctxInfo.glslGeneration() >= k150_GrGLSLGenerati on;
371 } else { 370 } else {
372 fShaderDerivativeSupport = ctxInfo.version() >= GR_GL_VER(3, 0) || 371 fShaderDerivativeSupport = ctxInfo.hasExtension("GL_OES_standard_derivat ives");
373 ctxInfo.hasExtension("GL_OES_standard_derivat ives");
374 } 372 }
375 373
376 if (GrGLCaps::kES_IMG_MsToTexture_MSFBOType == fMSFBOType) { 374 if (GrGLCaps::kES_IMG_MsToTexture_MSFBOType == fMSFBOType) {
377 GR_GL_GetIntegerv(gli, GR_GL_MAX_SAMPLES_IMG, &fMaxSampleCount); 375 GR_GL_GetIntegerv(gli, GR_GL_MAX_SAMPLES_IMG, &fMaxSampleCount);
378 } else if (GrGLCaps::kNone_MSFBOType != fMSFBOType) { 376 } else if (GrGLCaps::kNone_MSFBOType != fMSFBOType) {
379 GR_GL_GetIntegerv(gli, GR_GL_MAX_SAMPLES, &fMaxSampleCount); 377 GR_GL_GetIntegerv(gli, GR_GL_MAX_SAMPLES, &fMaxSampleCount);
380 } 378 }
381 379
382 this->initConfigTexturableTable(ctxInfo, gli); 380 this->initConfigTexturableTable(ctxInfo, gli);
383 this->initConfigRenderableTable(ctxInfo); 381 this->initConfigRenderableTable(ctxInfo);
(...skipping 481 matching lines...) Expand 10 before | Expand all | Expand 10 after
865 r.appendf("Two Format Limit: %s\n", (fTwoFormatLimit ? "YES": "NO")); 863 r.appendf("Two Format Limit: %s\n", (fTwoFormatLimit ? "YES": "NO"));
866 r.appendf("Fragment coord conventions support: %s\n", 864 r.appendf("Fragment coord conventions support: %s\n",
867 (fFragCoordsConventionSupport ? "YES": "NO")); 865 (fFragCoordsConventionSupport ? "YES": "NO"));
868 r.appendf("Vertex array object support: %s\n", (fVertexArrayObjectSupport ? "YES": "NO")); 866 r.appendf("Vertex array object support: %s\n", (fVertexArrayObjectSupport ? "YES": "NO"));
869 r.appendf("Use non-VBO for dynamic data: %s\n", 867 r.appendf("Use non-VBO for dynamic data: %s\n",
870 (fUseNonVBOVertexAndIndexDynamicData ? "YES" : "NO")); 868 (fUseNonVBOVertexAndIndexDynamicData ? "YES" : "NO"));
871 r.appendf("Full screen clear is free: %s\n", (fFullClearIsFree ? "YES" : "NO ")); 869 r.appendf("Full screen clear is free: %s\n", (fFullClearIsFree ? "YES" : "NO "));
872 r.appendf("Drops tile on zero divide: %s\n", (fDropsTileOnZeroDivide ? "YES" : "NO")); 870 r.appendf("Drops tile on zero divide: %s\n", (fDropsTileOnZeroDivide ? "YES" : "NO"));
873 return r; 871 return r;
874 } 872 }
OLDNEW
« no previous file with comments | « no previous file | src/gpu/gl/GrGLContext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698