Remove GrContext.h dependence on GrGpu.h
Review URL: http://codereview.appspot.com/4433096/
git-svn-id: http://skia.googlecode.com/svn/trunk@1227 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gpu/src/GrGpuFactory.cpp b/gpu/src/GrGpuFactory.cpp
index 1715333..c6f541c 100644
--- a/gpu/src/GrGpuFactory.cpp
+++ b/gpu/src/GrGpuFactory.cpp
@@ -28,10 +28,10 @@
#include "GrGpuGLShaders.h"
#include "GrGpuGLShaders2.h"
-GrGpu* GrGpu::Create(Engine engine, Platform3DContext context3D) {
+GrGpu* GrGpu::Create(GrEngine engine, GrPlatform3DContext context3D) {
- if (kOpenGL_Shaders_Engine == engine ||
- kOpenGL_Fixed_Engine == engine) {
+ if (kOpenGL_Shaders_GrEngine == engine ||
+ kOpenGL_Fixed_GrEngine == engine) {
// If no GL bindings have been installed, fall-back to calling the
// GL functions that have been linked with the executable.
if (!GrGLGetGLInterface()) {
@@ -46,7 +46,7 @@
GrGpu* gpu = NULL;
switch (engine) {
- case kOpenGL_Shaders_Engine:
+ case kOpenGL_Shaders_GrEngine:
GrAssert(NULL == context3D);
{
#if GR_USE_NEW_GLSHADERS
@@ -56,11 +56,11 @@
#endif
}
break;
- case kOpenGL_Fixed_Engine:
+ case kOpenGL_Fixed_GrEngine:
GrAssert(NULL == context3D);
gpu = new GrGpuGLFixed;
break;
- case kDirect3D9_Engine:
+ case kDirect3D9_GrEngine:
GrAssert(NULL != context3D);
#if GR_WIN32_BUILD
// gpu = new GrGpuD3D9((IDirect3DDevice9*)context3D);