Changeset 2527

Timestamp:

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

Author:

sandervl

Message:

JvdH's opengl changes

Location:

trunk/src/gdi32

Files:

• gdi32.cpp (modified) (4 diffs)
• opengl.cpp (modified) (7 diffs)

trunk/src/gdi32/gdi32.cpp ¶

@@ -1 @@
-/* $Id: gdi32.cpp,v 1.32 2000-01-26 23:19:55 sandervl Exp $ */
+/* $Id: gdi32.cpp,v 1.33 2000-01-26 23:48:02 sandervl Exp $ */
 
 /*
@@ -670 +670 @@
 
     rc = O32_CreateBitmap(nWidth, nHeight, cPlanes, cBitsPerPel, lpvBits);
-    dprintf(("GDI32: CreateBitmap (%d,%d) bps %d returned %x\n", nWidth, nHeight, cBitsPerPel, rc));
+    dprintf(("GDI32: CreateBitmap (%d,%d) bps %d returned %d\n", nWidth, nHeight, cBitsPerPel, rc));
     return(rc);
 }
@@ -2406 +2406 @@
 }
 //******************************************************************************
+
 //******************************************************************************
 BOOL WIN32API SetObjectOwner( HGDIOBJ arg1, int arg2 )
@@ -3137 +3138 @@
 }
 
-
-/*****************************************************************************
- * Name      : int GetPixelFormat
- * Purpose   : The GetPixelFormat function obtains the index of the specified
- *             device context's currently selected pixel format.
- * Parameters: HDC  hdc   handle of device context
- * Variables :
- * Result    : 0 / 1
- * Remark    :
- * Status    : UNTESTED STUB
- *
- * Author    : Patrick Haller [Mon, 1998/06/15 08:00]
- *****************************************************************************/
-
-int WIN32API GetPixelFormat(HDC hdc)
-{
-  dprintf(("GDI32: GetPixelFormat(%08xh) not implemented.\n",
-           hdc));
-
-  return (0);
-}
-
-
 /*****************************************************************************
  * Name      : BOOL SetDeviceGammaRamp

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));
+}
 
 /*****************************************************************************