| Index: tools/gpu/gl/angle/GLTestContext_angle.cpp
|
| diff --git a/tools/gpu/gl/angle/GLContext_angle.cpp b/tools/gpu/gl/angle/GLTestContext_angle.cpp
|
| similarity index 94%
|
| rename from tools/gpu/gl/angle/GLContext_angle.cpp
|
| rename to tools/gpu/gl/angle/GLTestContext_angle.cpp
|
| index f1e8aad50940399f04e9e7878463719f528f6f57..0b4aae9f343dfaf68c1a5aae3e61f41827498ede 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;
|
|
|