diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-05-05 12:39:20 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-05-05 12:39:20 +0000 |
| commit | 2ba4abbb3171e058b7f9b1d7c7954ee6989a21e6 (patch) | |
| tree | fd164083784a6770f0710b8dd9e8df7942f2f7c5 /gpu | |
| parent | 6aef1fb4ebf8b8b2ed352eb81e961565fbbd56cb (diff) | |
Switch to GrGpuGLShaders (instead of GrGpuGLShaders2).
git-svn-id: http://skia.googlecode.com/svn/trunk@1251 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/include/GrConfig.h | 4 | ||||
| -rw-r--r-- | gpu/src/GrGpuFactory.cpp | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/gpu/include/GrConfig.h b/gpu/include/GrConfig.h index 2f89888fe0..f1f24375ca 100644 --- a/gpu/include/GrConfig.h +++ b/gpu/include/GrConfig.h @@ -334,10 +334,6 @@ inline void GrCrash(const char* msg) { GrPrintf(msg); GrAlwaysAssert(false); } #define GR_DUMP_TEXTURE_UPLOAD 0 #endif -#ifndef GR_USE_NEW_GLSHADERS - #define GR_USE_NEW_GLSHADERS 0 -#endif - /** * GR_COLLECT_STATS controls whether the GrGpu class collects stats. * If not already defined then collect in debug build but not release. diff --git a/gpu/src/GrGpuFactory.cpp b/gpu/src/GrGpuFactory.cpp index 0e316a49ad..642a55bccc 100644 --- a/gpu/src/GrGpuFactory.cpp +++ b/gpu/src/GrGpuFactory.cpp @@ -55,10 +55,10 @@ GrGpu* GrGpu::Create(GrEngine engine, GrPlatform3DContext context3D) { case kOpenGL_Shaders_GrEngine: GrAssert(NULL == context3D); { -#if GR_USE_NEW_GLSHADERS - gpu = new GrGpuGLShaders; -#else +#if 0 // old code path, will be removed soon gpu = new GrGpuGLShaders2; +#else + gpu = new GrGpuGLShaders; #endif } break; |