Changeset 2595 for trunk/src/opengl/glucb32.cpp

Timestamp:

Feb 1, 2000, 8:42:09 PM (26 years ago)

Author:

sandervl

Message:

JvdH:Ported SGI GLUT sources + Opengl update

File:

• trunk/src/opengl/glucb32.cpp (modified) (6 diffs)

trunk/src/opengl/glucb32.cpp

@@ -1 @@
-/* $Id: glucb32.cpp,v 1.1 2000-01-27 21:49:12 sandervl Exp $ */
+/* $Id: glucb32.cpp,v 1.2 2000-02-01 19:41:54 sandervl Exp $ */
 /*****************************************************************************/
 /*                                                                           */
@@ -60 +60 @@
 GLUCB *OS2glucbCreateGlucb(GLenum objtype,void *object,GLenum which,GLint num_parms)
 {
-  GLUCB *glucb;
-  int    i;
+  GLUCB  *glucb;
+  APIRET  rc;
+  int     i;
 
   glucb=(GLUCB *)malloc(sizeof(GLUCB));
@@ -70 +71 @@
   glucb->parms_on_stack=num_parms;
 
-  DosAllocMem((PPVOID)(&glucb->entryAddress),
-              4096,
-              PAG_COMMIT | PAG_EXECUTE | PAG_READ | PAG_WRITE);
+  rc=DosAllocMem((PPVOID)(&glucb->entryAddress),
+                 4096,
+                 PAG_COMMIT | PAG_EXECUTE | PAG_READ | PAG_WRITE);
 
   /* Setup the actual machine-code in this page... */
@@ -121 +122 @@
 {
   ULONG  addr=(ULONG)Address;
-  ULONG  addr_e=(ULONG)glucb->entryAddress+4*glucb->parms_on_stack;
-  ULONG  addr_offset=addr_e-addr-5;
+  ULONG  addr_call=4*glucb->parms_on_stack+1;
   BYTE  *code=(BYTE *)glucb->entryAddress;
-
-  *((ULONG *)code[addr_e+1])=addr_offset;
+  ULONG  addr_e=(ULONG)code+addr_call;
+  LONG   addr_offset=addr-addr_e-4;
+
+  (((ULONG *)addr_e)[0])=addr_offset;
 }
 
@@ -199 +201 @@
                                         GLUWINCALLBACK CallBackFunc)
 {
-  dprintf(("GLUCALLBACK: Registering Callback!\n"));
-
   switch(objtype)
     {
@@ -228 +228 @@
         switch (which)
           {
-            case GLU_TESS_BEGIN:
-            case GLU_TESS_VERTEX:
-            case GLU_TESS_ERROR:
-            case GLU_TESS_EDGE_FLAG:
-            case GLU_TESS_COMBINE:
-            case GLU_TESS_BEGIN_DATA:
-            case GLU_TESS_VERTEX_DATA:
-            case GLU_TESS_END_DATA:
-            case GLU_TESS_ERROR_DATA:
-            case GLU_TESS_EDGE_FLAG_DATA:
-            case GLU_TESS_COMBINE_DATA:
-              return OS2glucbGenerateCallbackFunc(objtype,object,which,CallBackFunc,1);
-
             case GLU_TESS_END:
               return OS2glucbGenerateCallbackFunc(objtype,object,which,CallBackFunc,0);
+
+            case GLU_TESS_BEGIN:
+            case GLU_TESS_EDGE_FLAG:
+            case GLU_TESS_END_DATA:
+            case GLU_TESS_ERROR:
+            case GLU_TESS_VERTEX:
+              return OS2glucbGenerateCallbackFunc(objtype,object,which,CallBackFunc,1);
+
+            case GLU_TESS_BEGIN_DATA:
+            case GLU_TESS_EDGE_FLAG_DATA:
+            case GLU_TESS_ERROR_DATA:
+            case GLU_TESS_VERTEX_DATA:
+              return OS2glucbGenerateCallbackFunc(objtype,object,which,CallBackFunc,2);
+
+            case GLU_TESS_COMBINE:
+              return OS2glucbGenerateCallbackFunc(objtype,object,which,CallBackFunc,4);
+
+            case GLU_TESS_COMBINE_DATA:
+              return OS2glucbGenerateCallbackFunc(objtype,object,which,CallBackFunc,5);
 
             default:                  /* All legal callback values defined!*/