Remove the compile-time selection of the GL implementation based on the
GR_SUPPORT_GLDESKTOP family of macros.
Support for the platform is configured dynamically, by querying the
fBindingsExported member of active GrGLInterface instance.
Review: http://codereview.appspot.com/4298048/
git-svn-id: http://skia.googlecode.com/svn/trunk@960 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gpu/src/GrGpuGLFixed.cpp b/gpu/src/GrGpuGLFixed.cpp
index 5a053a0..3e6d909 100644
--- a/gpu/src/GrGpuGLFixed.cpp
+++ b/gpu/src/GrGpuGLFixed.cpp
@@ -17,8 +17,6 @@
#include "GrGLConfig.h"
-#if GR_SUPPORT_GLES1 || GR_SUPPORT_GLDESKTOP
-
#include "GrGpuGLFixed.h"
#include "GrGpuVertex.h"
@@ -137,13 +135,13 @@
}
}
-#if GR_SUPPORT_GLES1
- if (BlendCoefReferencesConstant(fCurrDrawState.fSrcBlend) ||
- BlendCoefReferencesConstant(fCurrDrawState.fDstBlend)) {
- uimpl("ES1 doesn't support blend constant");
- return false;
+ if (GR_GL_SUPPORT_ES1) {
+ if (BlendCoefReferencesConstant(fCurrDrawState.fSrcBlend) ||
+ BlendCoefReferencesConstant(fCurrDrawState.fDstBlend)) {
+ unimpl("ES1 doesn't support blend constant");
+ return false;
+ }
}
-#endif
if (!flushGLStateCommon(type)) {
return false;
@@ -330,6 +328,3 @@
fHWGeometryState.fVertexLayout = fGeometrySrc.fVertexLayout;
fHWGeometryState.fArrayPtrsDirty = false;
}
-
-#endif
-