diff options
author | 2018-05-30 20:54:40 +0000 | |
---|---|---|
committer | 2018-05-30 20:54:49 +0000 | |
commit | 35b40ce7afd69ea09513e0c08a6bb7ae1ec3fe07 (patch) | |
tree | 0cbc4beb96753151145fff93b8784d7781aa1086 | |
parent | 5b3f76ed0132e12272c781d6df678631578c3dc8 (diff) |
Revert "Check for ANGLE's implementation of texture_rectangle"
This reverts commit 00f8866a321332f07520e3c12963aa1332bb7e82.
Reason for revert: Seems to be breaking angle test bots. Eg:
https://chromium-swarm.appspot.com/task?id=3dcb7f58728de610&refresh=10
Original change's description:
> Check for ANGLE's implementation of texture_rectangle
>
> ANGLE has implemented extension to support for texture_rectangle. Check
> for its existence as well as GL_ARB_texture_rectangle extension.
>
> Intended to follow up on Chrome side to avoid copy into texture 2d for
> PaintCanvasVideoRenderer.
>
> Bug: skia:7903
> Change-Id: I450aa7fcd08628831251a9e142fd50719723282d
> Reviewed-on: https://skia-review.googlesource.com/130962
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Weiliang Chen <weiliangc@chromium.org>
TBR=bsalomon@google.com,weiliangc@chromium.org
Change-Id: I9fbf9ff314ffcf3abcc5275bd68124f4b329da21
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:7903
Reviewed-on: https://skia-review.googlesource.com/131060
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Ravi Mistry <rmistry@google.com>
-rw-r--r-- | gm/rectangletexture.cpp | 3 | ||||
-rw-r--r-- | src/gpu/gl/GrGLCaps.cpp | 5 | ||||
-rw-r--r-- | src/gpu/gl/GrGLDefines.h | 2 | ||||
-rw-r--r-- | tools/gpu/gl/GLTestContext.cpp | 3 |
4 files changed, 6 insertions, 7 deletions
diff --git a/gm/rectangletexture.cpp b/gm/rectangletexture.cpp index 13e4e79bef..1ce915bf52 100644 --- a/gm/rectangletexture.cpp +++ b/gm/rectangletexture.cpp @@ -72,8 +72,7 @@ protected: } if (!(kGL_GrGLStandard == glCtx->standard() && glCtx->version() >= GR_GL_VER(3, 1)) && - !(glCtx->hasExtension("GL_ARB_texture_rectangle") || - glCtx->hasExtension("GL_ANGLE_texture_rectangle"))) { + !glCtx->hasExtension("GL_ARB_texture_rectangle")) { return nullptr; } diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp index 22f248b70a..4660cdaf53 100644 --- a/src/gpu/gl/GrGLCaps.cpp +++ b/src/gpu/gl/GrGLCaps.cpp @@ -221,8 +221,7 @@ void GrGLCaps::init(const GrContextOptions& contextOptions, fBindUniformLocationSupport = ctxInfo.hasExtension("GL_CHROMIUM_bind_uniform_location"); if (kGL_GrGLStandard == standard) { - if (version >= GR_GL_VER(3, 1) || ctxInfo.hasExtension("GL_ARB_texture_rectangle") || - ctxInfo.hasExtension("GL_ANGLE_texture_rectangle")) { + 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) { @@ -2922,3 +2921,5 @@ bool GrGLCaps::getConfigFromBackendFormat(const GrBackendFormat& format, SkColor } return validate_sized_format(*glFormat, ct, config, fStandard); } + + diff --git a/src/gpu/gl/GrGLDefines.h b/src/gpu/gl/GrGLDefines.h index 2c829835e6..645397316b 100644 --- a/src/gpu/gl/GrGLDefines.h +++ b/src/gpu/gl/GrGLDefines.h @@ -1042,7 +1042,7 @@ /* GL_OES_EGL_image_external */ #define GR_GL_TEXTURE_EXTERNAL 0x8D65 -/* GL_ARB_texture_rectangle or GL_ANGLE_texture_rectangle */ +/* GL_ARB_texture_rectangle */ #define GR_GL_TEXTURE_RECTANGLE 0x84F5 /* GL_EXT_window_rectangles */ diff --git a/tools/gpu/gl/GLTestContext.cpp b/tools/gpu/gl/GLTestContext.cpp index 6a80707132..7a67a8a969 100644 --- a/tools/gpu/gl/GLTestContext.cpp +++ b/tools/gpu/gl/GLTestContext.cpp @@ -318,8 +318,7 @@ GrGLint GLTestContext::createTextureRectangle(int width, int height, GrGLenum in GrGLenum externalFormat, GrGLenum externalType, GrGLvoid* data) { if (!(kGL_GrGLStandard == fGL->fStandard && GrGLGetVersion(fGL.get()) >= GR_GL_VER(3, 1)) && - !(fGL->fExtensions.has("GL_ARB_texture_rectangle") || - fGL->fExtensions.has("GL_ANGLE_texture_rectangle"))) { + !fGL->fExtensions.has("GL_ARB_texture_rectangle")) { return 0; } |