Changeset 2661 for trunk/src/gdi32/opengl.cpp

Timestamp:

Feb 5, 2000, 4:55:54 PM (26 years ago)

Author:

sandervl

Message:

Don't use Open32 apis for loading opengl32 or importing apis; import correct wgl apis

File:

• trunk/src/gdi32/opengl.cpp (modified) (7 diffs)

trunk/src/gdi32/opengl.cpp

@@ -1 @@
-/* $Id: opengl.cpp,v 1.6 2000-01-26 23:48:03 sandervl Exp $ */
+/* $Id: opengl.cpp,v 1.7 2000-02-05 15:55:54 sandervl Exp $ */
 
 /*
@@ -65 +65 @@
   if(hOpenGL == NULL)
   {
-     hOpenGL = O32_LoadLibrary("OPENGL32.DLL");
+     hOpenGL = LoadLibraryA("OPENGL32.DLL");
      if(hOpenGL == NULL)
        return(FALSE);
@@ -71 +71 @@
 
   if(glChoosePixelFormat == NULL) {
-        glChoosePixelFormat = (CHOOSEPIXELFMT)O32_GetProcAddress(hOpenGL, "OS2wglChoosePixelFormat");
+        glChoosePixelFormat = (CHOOSEPIXELFMT)GetProcAddress(hOpenGL, "wglChoosePixelFormat");
         if(glChoosePixelFormat == NULL)
                 return(0);
@@ -77 +77 @@
 
   if(glSetPixelFormat == NULL) {
-        glSetPixelFormat = (SETPIXELFMT)O32_GetProcAddress(hOpenGL, "OS2wglSetPixelFormat");
+        glSetPixelFormat = (SETPIXELFMT)GetProcAddress(hOpenGL, "wglSetPixelFormat");
         if(glSetPixelFormat == NULL)
                 return(FALSE);
@@ -83 +83 @@
 
   if(glSwapBuffers == NULL) {
-        glSwapBuffers = (SWAPBUFFERS)O32_GetProcAddress(hOpenGL, "OS2wglSwapBuffers");
+        glSwapBuffers = (SWAPBUFFERS)GetProcAddress(hOpenGL, "wglSwapBuffers");
         if(glSwapBuffers == NULL)
                 return(FALSE);
@@ -89 +89 @@
 
   if(glDescribePixelFormat == NULL) {
-        glDescribePixelFormat = (DESCRIBEPIXELFMT)O32_GetProcAddress(hOpenGL, "OS2wglDescribePixelFormat");
+        glDescribePixelFormat = (DESCRIBEPIXELFMT)GetProcAddress(hOpenGL, "wglDescribePixelFormat");
         if(glDescribePixelFormat == NULL)
                 return(FALSE);
@@ -95 +95 @@
 
   if(glGetPixelFormat == NULL) {
-        glGetPixelFormat = (GETPIXELFMT)O32_GetProcAddress(hOpenGL, "OS2wglGetPixelFormat");
+        glGetPixelFormat = (GETPIXELFMT)GetProcAddress(hOpenGL, "wglGetPixelFormat");
         if(glGetPixelFormat == NULL)
                 return(FALSE);