diff options
| author |  bsalomon <bsalomon@google.com> | 2016-03-31 10:59:06 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-31 10:59:06 -0700 |
| commit | 273c0f5e87397c40d22bb7e3ee078bb46a3f6860 (patch) | |
| tree | 70436fd146c39be9702c6c295a8fd204a38d865f /tools/gpu/GrContextFactory.cpp | |
| 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/GrContextFactory.cpp')
| -rwxr-xr-x | tools/gpu/GrContextFactory.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/tools/gpu/GrContextFactory.cpp b/tools/gpu/GrContextFactory.cpp index cb23014ad0..e5fa2c799e 100755 --- a/tools/gpu/GrContextFactory.cpp +++ b/tools/gpu/GrContextFactory.cpp @@ -7,19 +7,19 @@ */ #include "GrContextFactory.h" -#include "gl/GLContext.h" +#include "gl/GLTestContext.h" #if SK_ANGLE - #include "gl/angle/GLContext_angle.h" + #include "gl/angle/GLTestContext_angle.h" #endif #if SK_COMMAND_BUFFER - #include "gl/command_buffer/GLContext_command_buffer.h" + #include "gl/command_buffer/GLTestContext_command_buffer.h" #endif -#include "gl/debug/DebugGLContext.h" +#include "gl/debug/DebugGLTestContext.h" #if SK_MESA - #include "gl/mesa/GLContext_mesa.h" + #include "gl/mesa/GLTestContext_mesa.h" #endif -#include "gl/null/NullGLContext.h" +#include "gl/null/NullGLTestContext.h" #include "gl/GrGLGpu.h" #include "GrCaps.h" @@ -73,43 +73,43 @@ GrContextFactory::ContextInfo GrContextFactory::getContextInfo(GLContextType typ return ContextInfo(context.fGrContext, context.fGLContext); } } - SkAutoTDelete<GLContext> glCtx; + SkAutoTDelete<GLTestContext> glCtx; SkAutoTUnref<GrContext> grCtx; switch (type) { case kNative_GLContextType: - glCtx.reset(CreatePlatformGLContext(kNone_GrGLStandard)); + glCtx.reset(CreatePlatformGLTestContext(kNone_GrGLStandard)); break; case kGL_GLContextType: - glCtx.reset(CreatePlatformGLContext(kGL_GrGLStandard)); + glCtx.reset(CreatePlatformGLTestContext(kGL_GrGLStandard)); break; case kGLES_GLContextType: - glCtx.reset(CreatePlatformGLContext(kGLES_GrGLStandard)); + glCtx.reset(CreatePlatformGLTestContext(kGLES_GrGLStandard)); break; #if SK_ANGLE #ifdef SK_BUILD_FOR_WIN case kANGLE_GLContextType: - glCtx.reset(CreateANGLEDirect3DGLContext()); + glCtx.reset(CreateANGLEDirect3DGLTestContext()); break; #endif case kANGLE_GL_GLContextType: - glCtx.reset(CreateANGLEOpenGLGLContext()); + glCtx.reset(CreateANGLEOpenGLGLTestContext()); break; #endif #if SK_COMMAND_BUFFER case kCommandBuffer_GLContextType: - glCtx.reset(CommandBufferGLContext::Create()); + glCtx.reset(CommandBufferGLTestContext::Create()); break; #endif #if SK_MESA case kMESA_GLContextType: - glCtx.reset(CreateMesaGLContext()); + glCtx.reset(CreateMesaGLTestContext()); break; #endif case kNull_GLContextType: - glCtx.reset(CreateNullGLContext()); + glCtx.reset(CreateNullGLTestContext()); break; case kDebug_GLContextType: - glCtx.reset(CreateDebugGLContext()); + glCtx.reset(CreateDebugGLTestContext()); break; } if (nullptr == glCtx.get()) { |