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

Timestamp:

Jan 27, 2000, 12:48:03 AM (26 years ago)

Author:

sandervl

Message:

JvdH's opengl changes

File:

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

trunk/src/gdi32/opengl.cpp

@@ -1 @@
-/* $Id: opengl.cpp,v 1.5 2000-01-26 23:19:55 sandervl Exp $ */
+/* $Id: opengl.cpp,v 1.6 2000-01-26 23:48:03 sandervl Exp $ */
 
 /*
@@ -33 +33 @@
 typedef BOOL (* WIN32API SETPIXELFMT) (HDC, int, CONST PIXELFORMATDESCRIPTOR *);
 typedef BOOL (* WIN32API SWAPBUFFERS) (HDC hdc);
-// JVDH MOD STARTS
 typedef int  (* WIN32API DESCRIBEPIXELFMT) (HDC, int, UINT, LPPIXELFORMATDESCRIPTOR);
-// JVDH MOD ENDS
+typedef int  (* WIN32API GETPIXELFMT) (HDC);
 
 
@@ -45 +44 @@
 static SETPIXELFMT       glSetPixelFormat      = NULL;
 static SWAPBUFFERS       glSwapBuffers         = NULL;
-// JVDH MOD STARTS
 static DESCRIBEPIXELFMT  glDescribePixelFormat = NULL;
-// JVDH MOD ENDS
+static GETPIXELFMT       glGetPixelFormat      = NULL;
 static HINSTANCE         hOpenGL               = NULL;
 
@@ -90 +88 @@
   }
 
-// JVDH MOD STARTS
   if(glDescribePixelFormat == NULL) {
         glDescribePixelFormat = (DESCRIBEPIXELFMT)O32_GetProcAddress(hOpenGL, "OS2wglDescribePixelFormat");
@@ -96 +93 @@
                 return(FALSE);
   }
-// JVDH MOD ENDS
+
+  if(glGetPixelFormat == NULL) {
+        glGetPixelFormat = (GETPIXELFMT)O32_GetProcAddress(hOpenGL, "OS2wglGetPixelFormat");
+        if(glGetPixelFormat == NULL)
+                return(FALSE);
+  }
 
   return(TRUE);                        /* OpenGL is initialized and enabled*/
@@ -117 +119 @@
                                     CONST PIXELFORMATDESCRIPTOR*,pformat)
 {
-  //@@@PH: ?? return(1);
-
   if (glChoosePixelFormat == NULL)
     if (internalOpenGLEnable() == FALSE)
@@ -138 +138 @@
 }
 
+ODINFUNCTION1(int,GetPixelFormat,HDC,hdc)
+{
+  if (glGetPixelFormat == NULL)
+    if (internalOpenGLEnable() == FALSE)
+      return(0);
+
+  return(glGetPixelFormat(hdc));
+}
 
 /*****************************************************************************