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

Unified Diff: src/gpu/gl/GrGLCaps.cpp

Issue 1691853003: Do not try to use GL_texture_rectangle on GL ES (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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/gl/GrGLCaps.cpp
diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp
index c2ace6cd368948d25d60f95b766895dcfd1ce740..3771fc4c0e3e209f9e8dd2affb7d9c77f7138e3d 100644
--- a/src/gpu/gl/GrGLCaps.cpp
+++ b/src/gpu/gl/GrGLCaps.cpp
@@ -226,13 +226,18 @@ void GrGLCaps::init(const GrContextOptions& contextOptions,
}
}
- if ((kGL_GrGLStandard == standard && version >= GR_GL_VER(3, 1)) ||
- ctxInfo.hasExtension("GL_ARB_texture_rectangle")) {
- // We also require textureSize() support for rectangle 2D samplers which was added in GLSL
- // 1.40.
- if (ctxInfo.glslGeneration() >= k140_GrGLSLGeneration) {
Kimmo Kinnunen 2016/02/15 07:00:41 Soo.. doesn't this kind of mean that it is disable
- fRectangleTextureSupport = true;
+ if (kGL_GrGLStandard == standard) {
+ if (version >= GR_GL_VER(3, 1) || ctxInfo.hasExtension("GL_ARB_texture_rectangle")) {
+ // We also require textureSize() support for rectangle 2D samplers which was added in
+ // GLSL 1.40.
+ if (ctxInfo.glslGeneration() >= k140_GrGLSLGeneration) {
+ fRectangleTextureSupport = true;
+ }
}
+ } else {
+ // Command buffer exposes this in GL ES context for Chromium reasons,
+ // but it should not be used. Also, at the time of writing command buffer
+ // lacks TexImage2D support and ANGLE lacks GL ES 3.0 support.
}
if (kGL_GrGLStandard == standard) {
« 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