Changeset 18140 in vbox for trunk/src

Timestamp:

Mar 23, 2009 2:28:35 PM (16 years ago)

Author:

vboxsync

Message:

crOpenGL: use custom defines to destinguish 32/64 pointers

Location:

trunk/src/VBox/Additions/common/crOpenGL

Files:

• Linux_i386_exports.py (modified) (3 diffs)
• windows_i386_exports.py (modified) (3 diffs)

trunk/src/VBox/Additions/common/crOpenGL/Linux_i386_exports.py

@@ -26 +26 @@
     print ""
 
+    print"""
+    %ifdef RT_ARCH_AMD64
+     %define PTR_PRE qword
+     %define PTR_CB  8
+    %else
+     %define PTR_PRE dword
+     %define PTR_CB  4
+    %endif
+    """
+
     keys = apiutil.GetDispatchedFunctions(sys.argv[1]+"/APIspec.txt")
 
@@ -34 +44 @@
 
         print "BEGINPROC_EXPORTED gl%s" % func_name
-        print "\tjmp \t[RTHCPTR_PRE glim + RTHCPTR_CB*%d]" % index
+        print "\tjmp \t[PTR_PRE glim + PTR_CB*%d]" % index
         print "ENDPROC gl%s" % func_name
         print ""
@@ -59 +69 @@
             index = keys.index(alias)
             print "BEGINPROC_EXPORTED gl%s" % func_name
-            print "\tjmp \t[RTHCPTR_PRE glim + RTHCPTR_CB*%d]" % index
+            print "\tjmp \t[PTR_PRE glim + PTR_CB*%d]" % index
             print "ENDPROC gl%s" % func_name
             print ""

trunk/src/VBox/Additions/common/crOpenGL/windows_i386_exports.py

@@ -22 +22 @@
         print ""
 
+    print"""
+    %ifdef RT_ARCH_AMD64
+     %define PTR_PRE qword
+     %define PTR_CB  8
+    %else
+     %define PTR_PRE dword
+     %define PTR_CB  4
+    %endif
+    """
+
         # Get sorted list of dispatched functions.
         # The order is very important - it must match cr_opcodes.h
@@ -34 +44 @@
                 print "BEGINPROC_EXPORTED cr_gl%s" % func_name
                 print "%ifdef RT_ARCH_AMD64"
-        print "\tjmp \t[RTHCPTR_PRE glim + RTHCPTR_CB*%d]" % index
+        print "\tjmp \t[PTR_PRE glim + PTR_CB*%d]" % index
                 print "%else ; X86"
-        print "\tjmp \t[RTHCPTR_PRE _glim + RTHCPTR_CB*%d]" % index
+        print "\tjmp \t[PTR_PRE _glim + PTR_CB*%d]" % index
                 print "%endif"
                 print "ENDPROC cr_gl%s" % func_name
@@ -62 +72 @@
                         index = keys.index(alias)
                         print "BEGINPROC_EXPORTED cr_gl%s" % func_name
-            print "\tjmp \t[RTHCPTR_PRE glim + RTHCPTR_CB*%d]" % index
+            print "\tjmp \t[PTR_PRE glim + PTR_CB*%d]" % index
                         print "%else ; X86"
-            print "\tjmp \t[RTHCPTR_PRE _glim + RTHCPTR_CB*%d]" % index
+            print "\tjmp \t[PTR_PRE _glim + PTR_CB*%d]" % index
                         print "%endif"
                         print "ENDPROC cr_gl%s" % func_name