diff options
author | 2016-03-31 10:59:06 -0700 | |
---|---|---|
committer | 2016-03-31 10:59:06 -0700 | |
commit | 273c0f5e87397c40d22bb7e3ee078bb46a3f6860 (patch) | |
tree | 70436fd146c39be9702c6c295a8fd204a38d865f /tools/gpu/gl/angle | |
parent | a5598a40f82d69113fb4764dcb8de62151921807 (diff) |
rename sk_gpu_test::GLContext to sk_gpu_test::GLTestContext
rename subclasses
Fix up the EGL native GLTestContext
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1849463002
TBR=jvanverth@google.com
Committed: https://skia.googlesource.com/skia/+/4c7f0a16312c374eba4e8d5d46435ce9eb0b9971
Review URL: https://codereview.chromium.org/1849463002
Diffstat (limited to 'tools/gpu/gl/angle')
-rw-r--r-- | tools/gpu/gl/angle/GLTestContext_angle.cpp (renamed from tools/gpu/gl/angle/GLContext_angle.cpp) | 19 | ||||
-rw-r--r-- | tools/gpu/gl/angle/GLTestContext_angle.h (renamed from tools/gpu/gl/angle/GLContext_angle.h) | 14 |
2 files changed, 17 insertions, 16 deletions
diff --git a/tools/gpu/gl/angle/GLContext_angle.cpp b/tools/gpu/gl/angle/GLTestContext_angle.cpp index f1e8aad509..0b4aae9f34 100644 --- a/tools/gpu/gl/angle/GLContext_angle.cpp +++ b/tools/gpu/gl/angle/GLTestContext_angle.cpp @@ -6,7 +6,7 @@ * found in the LICENSE file. */ -#include "GLContext_angle.h" +#include "GLTestContext_angle.h" #include <EGL/egl.h> #include <EGL/eglext.h> @@ -84,7 +84,7 @@ void* get_angle_egl_display(void* nativeDisplay, bool useGLBackend) { return display; } -class ANGLEGLContext : public sk_gpu_test::GLContext { +class ANGLEGLContext : public sk_gpu_test::GLTestContext { public: ANGLEGLContext(bool preferGLBackend); ~ANGLEGLContext() override; @@ -92,7 +92,7 @@ public: GrEGLImage texture2DToEGLImage(GrGLuint texID) const override; void destroyEGLImage(GrEGLImage) const override; GrGLuint eglImageToExternalTexture(GrEGLImage) const override; - sk_gpu_test::GLContext* createNew() const override; + sk_gpu_test::GLTestContext* createNew() const override; private: void destroyGLContext(); @@ -223,12 +223,13 @@ GrGLuint ANGLEGLContext::eglImageToExternalTexture(GrEGLImage image) const { return texID; } -sk_gpu_test::GLContext* ANGLEGLContext::createNew() const { +sk_gpu_test::GLTestContext* ANGLEGLContext::createNew() const { #ifdef SK_BUILD_FOR_WIN - sk_gpu_test::GLContext* ctx = fIsGLBackend ? sk_gpu_test::CreateANGLEOpenGLGLContext() - : sk_gpu_test::CreateANGLEDirect3DGLContext(); + sk_gpu_test::GLTestContext* ctx = fIsGLBackend? + ? sk_gpu_test::CreateANGLEOpenGLGLTestContext() + : sk_gpu_test::CreateANGLEDirect3DGLTestContext(); #else - sk_gpu_test::GLContext* ctx = sk_gpu_test::CreateANGLEOpenGLGLContext(); + sk_gpu_test::GLTestContext* ctx = sk_gpu_test::CreateANGLEOpenGLGLTestContext(); #endif if (ctx) { ctx->makeCurrent(); @@ -299,7 +300,7 @@ const GrGLInterface* CreateANGLEGLInterface() { } #ifdef SK_BUILD_FOR_WIN -GLContext* CreateANGLEDirect3DGLContext() { +GLTestContext* CreateANGLEDirect3DGLTestContext() { ANGLEGLContext* ctx = new ANGLEGLContext(false); if (!ctx->isValid()) { delete ctx; @@ -309,7 +310,7 @@ GLContext* CreateANGLEDirect3DGLContext() { } #endif -GLContext* CreateANGLEOpenGLGLContext() { +GLTestContext* CreateANGLEOpenGLGLTestContext() { ANGLEGLContext* ctx = new ANGLEGLContext(true); if (!ctx->isValid()) { delete ctx; diff --git a/tools/gpu/gl/angle/GLContext_angle.h b/tools/gpu/gl/angle/GLTestContext_angle.h index 519ea6b5a3..0140477a54 100644 --- a/tools/gpu/gl/angle/GLContext_angle.h +++ b/tools/gpu/gl/angle/GLTestContext_angle.h @@ -5,10 +5,10 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ -#ifndef GLContext_angle_DEFINED -#define GLContext_angle_DEFINED +#ifndef GLTestContext_angle_DEFINED +#define GLTestContext_angle_DEFINED -#include "gl/GLContext.h" +#include "gl/GLTestContext.h" namespace sk_gpu_test { @@ -19,12 +19,12 @@ namespace sk_gpu_test { const GrGLInterface* CreateANGLEGLInterface(); #ifdef SK_BUILD_FOR_WIN -/** Creates a GLContext backed by ANGLE's Direct3D backend. */ -GLContext* CreateANGLEDirect3DGLContext(); +/** Creates a GLTestContext backed by ANGLE's Direct3D backend. */ +GLTestContext* CreateANGLEDirect3DGLTestContext(); #endif -/** Creates a GLContext backed by ANGLE's OpenGL backend. */ -GLContext* CreateANGLEOpenGLGLContext(); +/** Creates a GLTestContext backed by ANGLE's OpenGL backend. */ +GLTestContext* CreateANGLEOpenGLGLTestContext(); } // namespace sk_gpu_test #endif |