Move function decls and macros out of public headers that are meant for internal use.
git-svn-id: http://skia.googlecode.com/svn/trunk@3849 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/gpu/gl/GrGLInterface.cpp b/src/gpu/gl/GrGLInterface.cpp
index 57de3e0..bbcf923 100644
--- a/src/gpu/gl/GrGLInterface.cpp
+++ b/src/gpu/gl/GrGLInterface.cpp
@@ -7,9 +7,8 @@
*/
-#include "GrTypes.h"
#include "gl/GrGLInterface.h"
-#include "gl/GrGLDefines.h"
+#include "GrGLUtil.h"
#include <stdio.h>
@@ -19,135 +18,6 @@
}
#endif
-GrGLBinding GrGLGetBindingInUseFromString(const char* versionString) {
- if (NULL == versionString) {
- GrAssert(!"NULL GL version string.");
- return kNone_GrGLBinding;
- }
-
- int major, minor;
-
- // check for desktop
- int n = sscanf(versionString, "%d.%d", &major, &minor);
- if (2 == n) {
- return kDesktop_GrGLBinding;
- }
-
- // check for ES 1
- char profile[2];
- n = sscanf(versionString, "OpenGL ES-%c%c %d.%d", profile, profile+1,
- &major, &minor);
- if (4 == n) {
- // we no longer support ES1.
- return kNone_GrGLBinding;
- }
-
- // check for ES2
- n = sscanf(versionString, "OpenGL ES %d.%d", &major, &minor);
- if (2 == n) {
- return kES2_GrGLBinding;
- }
- return kNone_GrGLBinding;
-}
-
-GrGLVersion GrGLGetVersionFromString(const char* versionString) {
- if (NULL == versionString) {
- GrAssert(!"NULL GL version string.");
- return 0;
- }
-
- int major, minor;
-
- int n = sscanf(versionString, "%d.%d", &major, &minor);
- if (2 == n) {
- return GR_GL_VER(major, minor);
- }
-
- char profile[2];
- n = sscanf(versionString, "OpenGL ES-%c%c %d.%d", profile, profile+1,
- &major, &minor);
- if (4 == n) {
- return GR_GL_VER(major, minor);
- }
-
- n = sscanf(versionString, "OpenGL ES %d.%d", &major, &minor);
- if (2 == n) {
- return GR_GL_VER(major, minor);
- }
-
- return 0;
-}
-
-GrGLSLVersion GrGLGetGLSLVersionFromString(const char* versionString) {
- if (NULL == versionString) {
- GrAssert(!"NULL GLSL version string.");
- return 0;
- }
-
- int major, minor;
-
- int n = sscanf(versionString, "%d.%d", &major, &minor);
- if (2 == n) {
- return GR_GLSL_VER(major, minor);
- }
-
- n = sscanf(versionString, "OpenGL ES GLSL ES %d.%d", &major, &minor);
- if (2 == n) {
- return GR_GLSL_VER(major, minor);
- }
-
-#ifdef SK_BUILD_FOR_ANDROID
- // android hack until the gpu vender updates their drivers
- n = sscanf(versionString, "OpenGL ES GLSL %d.%d", &major, &minor);
- if (2 == n) {
- return GR_GLSL_VER(major, minor);
- }
-#endif
-
- return 0;
-}
-
-bool GrGLHasExtensionFromString(const char* ext, const char* extensionString) {
- int extLength = strlen(ext);
-
- while (true) {
- int n = strcspn(extensionString, " ");
- if (n == extLength && 0 == strncmp(ext, extensionString, n)) {
- return true;
- }
- if (0 == extensionString[n]) {
- return false;
- }
- extensionString += n+1;
- }
-
- return false;
-}
-
-bool GrGLHasExtension(const GrGLInterface* gl, const char* ext) {
- const GrGLubyte* glstr;
- GR_GL_CALL_RET(gl, glstr, GetString(GR_GL_EXTENSIONS));
- return GrGLHasExtensionFromString(ext, (const char*) glstr);
-}
-
-GrGLBinding GrGLGetBindingInUse(const GrGLInterface* gl) {
- const GrGLubyte* v;
- GR_GL_CALL_RET(gl, v, GetString(GR_GL_VERSION));
- return GrGLGetBindingInUseFromString((const char*) v);
-}
-
-GrGLVersion GrGLGetVersion(const GrGLInterface* gl) {
- const GrGLubyte* v;
- GR_GL_CALL_RET(gl, v, GetString(GR_GL_VERSION));
- return GrGLGetVersionFromString((const char*) v);
-}
-
-GrGLSLVersion GrGLGetGLSLVersion(const GrGLInterface* gl) {
- const GrGLubyte* v;
- GR_GL_CALL_RET(gl, v, GetString(GR_GL_SHADING_LANGUAGE_VERSION));
- return GrGLGetGLSLVersionFromString((const char*) v);
-}
-
GrGLInterface::GrGLInterface() {
fBindingsExported = kNone_GrGLBinding;