Changeset 16381 in vbox

Timestamp:

Jan 29, 2009 5:15:36 PM (16 years ago)

Author:

vboxsync

Message:

crOpenGL: some initial functionality on linux

Location:

trunk/src/VBox/Additions/WINNT/Graphics/crOpenGL

Files:

• Linux_i386_exports.py (modified) (1 diff)
• Makefile.kmk (modified) (2 diffs)
• NULLfuncs.py (modified) (1 diff)
• context.c (modified) (2 diffs)
• load.c (modified) (1 diff)
• stub.h (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/crOpenGL/Linux_i386_exports.py

@@ -12 +12 @@
 def GenerateEntrypoints():
 
-        apiutil.CopyrightC()
+    #apiutil.CopyrightC()
 
-        # Get sorted list of dispatched functions.
-        # The order is very important - it must match cr_opcodes.h
-        # and spu_dispatch_table.h
-        keys = apiutil.GetDispatchedFunctions(sys.argv[1]+"/APIspec.txt")
+    # Get sorted list of dispatched functions.
+    # The order is very important - it must match cr_opcodes.h
+    # and spu_dispatch_table.h
+    print '%include "iprt/asmdefs.mac"'
+    print ""
+    print "%ifdef RT_ARCH_AMD64"
+    print "extern glim"
+    print "%else ; X86"
+    print "extern glim"
+    print "%endif"
+    print ""
 
-        for index in range(len(keys)):
-                func_name = keys[index]
-                if apiutil.Category(func_name) == "Chromium":
-                        continue
+    keys = apiutil.GetDispatchedFunctions(sys.argv[1]+"/APIspec.txt")
 
-                print "\t.align 4"
-                print ".globl gl%s" % func_name
-                print "\t.type gl%s,@function" % func_name
-                print "gl%s:" % func_name
-                print "\tmovl glim+%d, %%eax" % (4*index)
-                print "\tjmp *%eax"
-                print ""
+    for index in range(len(keys)):
+        func_name = keys[index]
+        if apiutil.Category(func_name) == "Chromium":
+            continue
+
+        print "BEGINPROC_EXPORTED gl%s" % func_name
+        print "%ifdef RT_ARCH_AMD64"
+        print "\tmov \trax, qword glim+%d" % (8*index)
+        print "\tjmp \t[rax]"
+        print "%else ; X86"
+        print "\tmov \teax, dword glim+%d" % (4*index)
+        print "\tjmp \t[eax]"
+        print "%endif"
+        print "ENDPROC gl%s" % func_name
+        print ""
 
 
-        print '/*'
-        print '* Aliases'
-        print '*/'
+    print ';'
+    print '; Aliases'
+    print ';'
 
-        # Now loop over all the functions and take care of any aliases
-        allkeys = apiutil.GetAllFunctions(sys.argv[1]+"/APIspec.txt")
-        for func_name in allkeys:
-                if "omit" in apiutil.ChromiumProps(func_name):
-                        continue
+    # Now loop over all the functions and take care of any aliases
+    allkeys = apiutil.GetAllFunctions(sys.argv[1]+"/APIspec.txt")
+    for func_name in allkeys:
+        if "omit" in apiutil.ChromiumProps(func_name):
+            continue
 
-                if func_name in keys:
-                        # we already processed this function earlier
-                        continue
+        if func_name in keys:
+            # we already processed this function earlier
+            continue
 
-                # alias is the function we're aliasing
-                alias = apiutil.Alias(func_name)
-                if alias:
-                        # this dict lookup should never fail (raise an exception)!
-                        index = keys.index(alias)
-                        print "\t.align 4"
-                        print ".globl gl%s" % func_name
-                        print "\t.type gl%s,@function" % func_name
-                        print "gl%s:" % func_name
-                        print "\tmovl glim+%d, %%eax" % (4*index)
-                        print "\tjmp *%eax"
-                        print ""
+        # alias is the function we're aliasing
+        alias = apiutil.Alias(func_name)
+        if alias:
+            # this dict lookup should never fail (raise an exception)!
+            index = keys.index(alias)
+            print "BEGINPROC_EXPORTED gl%s" % func_name
+            print "%ifdef RT_ARCH_AMD64"
+            print "\tmov \trax, qword glim+%d" % (8*index)
+            print "\tjmp \t[rax]"
+            print "%else ; X86"
+            print "\tmov \teax, dword glim+%d" % (4*index)
+            print "\tjmp \t[eax]"
+            print "%endif"
+            print "ENDPROC gl%s" % func_name
+            print ""
 
 
-        print '/*'
-        print '* No-op stubs'
-        print '*/'
+    print ';'
+    print '; No-op stubs'
+    print ';'
 
-        # Now generate no-op stub functions
-        for func_name in allkeys:
-                if "stub" in apiutil.ChromiumProps(func_name):
-                        print "\t.align 4"
-                        print ".globl gl%s" % func_name
-                        print "\t.type gl%s,@function" % func_name
-                        print "gl%s:" % func_name
-                        print "\tleave"
-                        print "\tret"
-                        print ""
+    # Now generate no-op stub functions
+    for func_name in allkeys:
+        if "stub" in apiutil.ChromiumProps(func_name):
+            print "BEGINPROC_EXPORTED gl%s" % func_name
+            print "\tleave"
+            print "\tret"
+            print "ENDPROC gl%s" % func_name
+            print ""
 
 

trunk/src/VBox/Additions/WINNT/Graphics/crOpenGL/Makefile.kmk

@@ -75 +75 @@
 endif
 
+ifeq ($(KBUILD_TARGET),linux)
+$$(PATH_VBoxOGL)/linux_exports.asm: \
+                $(PATH_SUB_CURRENT)/Linux_i386_exports.py \
+                $(APIFILES) $(PATH_SUB_CURRENT)/entrypoints.py \
+                | $$(dir $$@)
+        $(VBOX_BLD_PYTHON) $< $(GLAPI_PATH) > $@
+endif
+
 $$(PATH_VBoxOGL)/NULLfuncs.c: $(PATH_SUB_CURRENT)/NULLfuncs.py $(APIFILES) | $$(dir $$@)
         $(VBOX_BLD_PYTHON) $< $(GLAPI_PATH) > $@
@@ -114 +122 @@
         $(GEN_C_FILES)
 VBoxOGL_SOURCES.win := wgl.c icd_drv.c ogl_hgcm.c VBoxCROGL.rc $(GEN_ASM_FILES.win) $(GEN_C_FILES.win)
+VBoxOGL_SOURCES.linux := $(PATH_TARGET)/VBoxOGL/linux_exports.asm glx.c xfont.c
 VBoxOGL_DEPS.win   := $(GEN_H_FILES.win)
 VBoxOGL_CLEAN      := $(GEN_C_FILES)

trunk/src/VBox/Additions/WINNT/Graphics/crOpenGL/NULLfuncs.py

@@ -36 +36 @@
 
 
-print "SPUDispatchTable stubNULLDispatch = {"
+print "DECLEXPORT(SPUDispatchTable) stubNULLDispatch = {"
 for func_name in keys:
         print "\tNULL_%s," % (func_name)

trunk/src/VBox/Additions/WINNT/Graphics/crOpenGL/context.c

@@ -557 +557 @@
     Window root, child;
     unsigned int border, depth;
+
+    //@todo: Performing those checks is expensive operation, especially for simple apps with high FPS.
+    //       Disabling those tripples glxgears fps, thus using xevens instead of per frame polling is much more preffered.
+    //@todo: Check similiar on windows guests, though doubtfull as there're no XSync like calls on windows.
     if (!window
-            || !window->dpy
-            || !window->drawable
-            || !XGetGeometry(window->dpy, window->drawable, &root,
-                                             x, y, w, h, &border, &depth)
-            || !XTranslateCoordinates(window->dpy, window->drawable, root,
-                                                                *x, *y, x, y, &child)) {
+        || !window->dpy
+        || !window->drawable
+        || !XGetGeometry(window->dpy, window->drawable, &root,
+                         x, y, w, h, &border, &depth)
+        || !XTranslateCoordinates(window->dpy, window->drawable, root,
+                                  0, 0, x, y, &child)) 
+    {
+        crWarning("Failed to get windows geometry for %x, try xwininfo", (int) window);
         *x = *y = 0;
         *w = *h = 0;
@@ -981 +987 @@
                could be destroyed.
              */
+#ifdef WINDOWS
             crWindowDestroy((GLint)context->pOwnWindow->hWnd);
+#else
+            crWindowDestroy((GLint)context->pOwnWindow->drawable);
+#endif
         }
     }

trunk/src/VBox/Additions/WINNT/Graphics/crOpenGL/load.c

@@ -523 +523 @@
     stubInitNativeDispatch();
 
+
+/*crDebug("stub init");
+raise(SIGINT);*/
+
 #ifdef WINDOWS
     stubInstallWindowMessageHook();

trunk/src/VBox/Additions/WINNT/Graphics/crOpenGL/stub.h

@@ -179 +179 @@
 
 extern Stub stub;
-extern SPUDispatchTable glim;
+extern DECLEXPORT(SPUDispatchTable) glim;
 extern SPUDispatchTable stubThreadsafeDispatch;
 extern SPUDispatchTable stubNULLDispatch;