Remove GrGpuGLFixed subclass and ES1 support
Review URL: http://codereview.appspot.com/5376094/
git-svn-id: http://skia.googlecode.com/svn/trunk@2678 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/gpu/GrGpuFactory.cpp b/src/gpu/GrGpuFactory.cpp
index 9498da2..c954c7a 100644
--- a/src/gpu/GrGpuFactory.cpp
+++ b/src/gpu/GrGpuFactory.cpp
@@ -17,7 +17,6 @@
#include "GrGLConfig.h"
#include "GrGpu.h"
-#include "GrGpuGLFixed.h"
#include "GrGpuGLShaders.h"
GrGpu* GrGpu::Create(GrEngine engine, GrPlatform3DContext context3D) {
@@ -25,8 +24,7 @@
const GrGLInterface* glInterface = NULL;
SkAutoTUnref<const GrGLInterface> glInterfaceUnref;
- if (kOpenGL_Shaders_GrEngine == engine ||
- kOpenGL_Fixed_GrEngine == engine) {
+ if (kOpenGL_Shaders_GrEngine == engine) {
glInterface = reinterpret_cast<const GrGLInterface*>(context3D);
if (NULL == glInterface) {
glInterface = GrGLDefaultInterface();
@@ -41,29 +39,15 @@
#endif
return NULL;
}
- if (!glInterface->validate(engine)) {
+ if (!glInterface->validate()) {
#if GR_DEBUG
GrPrintf("Failed GL interface validation!\n");
#endif
return NULL;
}
+
+ return new GrGpuGLShaders(glInterface);
+ } else {
+ return NULL;
}
-
- GrGpu* gpu = NULL;
-
- switch (engine) {
- case kOpenGL_Shaders_GrEngine:
- GrAssert(NULL != glInterface);
- gpu = new GrGpuGLShaders(glInterface);
- break;
- case kOpenGL_Fixed_GrEngine:
- GrAssert(NULL != glInterface);
- gpu = new GrGpuGLFixed(glInterface);
- break;
- default:
- GrAssert(!"unknown engine");
- break;
- }
-
- return gpu;
}