From 1e04b3659cd35dfb47a9843fd42123bb6bdcaa5d Mon Sep 17 00:00:00 2001 From: Weiliang Chen Date: Thu, 12 Jul 2018 17:13:35 -0400 Subject: Reland: 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 Origin change's info: > Change-Id: I450aa7fcd08628831251a9e142fd50719723282d > Reviewed-on: https://skia-review.googlesource.com/130962 > Reviewed-by: Brian Salomon > Commit-Queue: Weiliang Chen Change-Id: Ifec92bdc07ec2b2dae38ffe99ec275924cbd37d8 Reviewed-on: https://skia-review.googlesource.com/139272 Commit-Queue: Weiliang Chen Reviewed-by: Brian Salomon --- tools/gpu/gl/GLTestContext.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'tools') diff --git a/tools/gpu/gl/GLTestContext.cpp b/tools/gpu/gl/GLTestContext.cpp index 7a67a8a969..e11f1b0eef 100644 --- a/tools/gpu/gl/GLTestContext.cpp +++ b/tools/gpu/gl/GLTestContext.cpp @@ -317,8 +317,11 @@ void GLTestContext::finish() { GrGLint GLTestContext::createTextureRectangle(int width, int height, GrGLenum internalFormat, 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")) { + // Should match GrGLCaps check for fRectangleTextureSupport. + 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"))) { return 0; } -- cgit v1.2.3