X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fscreen%2Fextensions.cxx;h=8ef03a6aa740ebe42b7cfe9db29488735a6cf440;hb=bb2cc6ef2dc3c6bef17d2fe7a834da438b7ec817;hp=4acf0e260160efcea9e8492fc48f75dc080f1bdf;hpb=ab34b86574c951f5a3ee6edaa5bfe2010c9b6e44;p=simgear.git

diff --git a/simgear/screen/extensions.cxx b/simgear/screen/extensions.cxx
index 4acf0e26..8ef03a6a 100644
--- a/simgear/screen/extensions.cxx
+++ b/simgear/screen/extensions.cxx
@@ -22,25 +22,22 @@
  *
  */
 
-#include <string.h>
-
-#ifdef WIN32
-#include <windows.h>
-#endif
-
-#if !defined( WIN32 ) && !defined( __APPLE__ )
-#include <dlfcn.h>
-#endif
 
 #include "extensions.hxx"
 
-bool SGSearchExtensionsString(char *extString, char *extName) {
+#include <cstring>
+#include <osg/GL> // for glGetString
+
+bool SGSearchExtensionsString(const char *extString, const char *extName) {
     // Returns GL_TRUE if the *extName string appears in the *extString string,
     // surrounded by white spaces, or GL_FALSE otherwise.
 
-    char *p, *end;
+    const char *p, *end;
     int n, extNameLen;
 
+    if ((extString == NULL) || (extName == NULL))
+        return false;
+
     extNameLen = strlen(extName);
 
     p=extString;
@@ -57,48 +54,12 @@ bool SGSearchExtensionsString(char *extString, char *extName) {
     return GL_FALSE;
 }
 
-bool SGIsOpenGLExtensionSupported(char *extName) {
+bool SGIsOpenGLExtensionSupported(const char *extName) {
    // Returns GL_TRUE if the OpenGL Extension whose name is *extName
    // is supported by the system, or GL_FALSE otherwise.
    //
    // The *extName string must follow the OpenGL extensions naming scheme
    // (ie: "GL_type_extension", like GL_EXT_convolution)
 
-    return SGSearchExtensionsString((char *)glGetString(GL_EXTENSIONS),
-extName);
+    return SGSearchExtensionsString((const char *)glGetString(GL_EXTENSIONS),extName);
 }
-
-#ifdef __APPLE__
-
-#include <CoreFoundation/CoreFoundation.h>
-
-void* macosxGetGLProcAddress(const char *func) {
-
-  /* We may want to cache the bundleRef at some point */
-  static CFBundleRef bundle = 0;
-
-  if (!bundle) {
-
-    CFURLRef bundleURL = CFURLCreateWithFileSystemPath (kCFAllocatorDefault,
-							CFSTR("/System/Library/Frameworks/OpenGL.framework"), kCFURLPOSIXPathStyle, true);
-
-    bundle = CFBundleCreate (kCFAllocatorDefault, bundleURL);
-    CFRelease (bundleURL);
-  }
-
-  if (!bundle)
-    return 0;
-
-  CFStringRef functionName = CFStringCreateWithCString
-    (kCFAllocatorDefault, func, kCFStringEncodingASCII);
-  
-  void *function;
-  
-  function = CFBundleGetFunctionPointerForName (bundle, functionName);
-
-  CFRelease (functionName);
-
-  return function;
-}
-
-#endif