Changeset 18542 in vbox for trunk/src/VBox/Additions/common/crOpenGL

Timestamp:

Mar 30, 2009 1:04:33 PM (16 years ago)

Author:

vboxsync

Message:

common/crOpenGL: C stubs, enabled only on Solaris.

Location:

trunk/src/VBox/Additions/common/crOpenGL

Files:

• Makefile.kmk (modified) (9 diffs)
• glx_c_exports.c (added)
• glx_proto.h (added)

trunk/src/VBox/Additions/common/crOpenGL/Makefile.kmk

@@ -51 +51 @@
  VBoxOGL_FAKEDRI = 1
  VBOX_PATH_MESA_SOURCE = $(VBOX_PATH_X11_ROOT)/mesa-7.2
-endif
+
+ # Only Solaris right now needs C stubs because I can't figure out how to
+ # generate the GOT based relocation ASM yet.
+ ifeq ($(KBUILD_TARGET),solaris)
+  ifdef VBoxOGL_FAKEDRI
+   VBOX_OGL_GLX_USE_CSTUBS = 1
+  endif
+ endif
+endif
+
 
 #
@@ -81 +90 @@
 else ifdef VBoxOGL_FAKEDRI
  VBoxOGL_DEFS          += VBOXOGL_FAKEDRI
+ VBoxOGL_DEFS.solaris  += VBOX_OGL_GLX_USE_CSTUBS
 endif
 ifeq ($(KBUILD_TARGET),win)
@@ -106 +116 @@
         glx.c \
         xfont.c
+ ifdef VBOX_OGL_GLX_USE_CSTUBS
+  VBoxOGL_SOURCES += glx_c_exports.c
+ endif
 
  ifdef VBoxOGL_DRI
@@ -121 +134 @@
         $(VBOX_PATH_CROGL_GENFILES)/linux_glxapi_exports.asm \
         $(VBOX_PATH_CROGL_GENFILES)/linux_exports_dri.asm
-  VBoxOGL_SOURCES.solaris += \
+  ifndef VBOX_OGL_GLX_USE_CSTUBS
+   VBoxOGL_SOURCES.solaris += \
         $(VBOX_PATH_CROGL_GENFILES)/solaris_glxapi_exports.asm \
         $(VBOX_PATH_CROGL_GENFILES)/solaris_exports_dri.asm
+  else
+   VBoxOGL_SOURCES.solaris += \
+        $(VBOX_PATH_CROGL_GENFILES)/solaris_exports.c  
+  endif
  else
   VBoxOGL_SOURCES.linux += \
         $(VBOX_PATH_CROGL_GENFILES)/linux_exports.asm
   VBoxOGL_SOURCES.solaris += \
-        $(VBOX_PATH_CROGL_GENFILES)/solaris_exports.asm
+        $(VBOX_PATH_CROGL_GENFILES)/solaris_exports.c
  endif
 endif
@@ -145 +163 @@
         $(VBOX_PATH_CROGL_GENFILES)/linux_exports.asm
 VBoxOGL_CLEAN.solaris        += \
-        $(VBOX_PATH_CROGL_GENFILES)/solaris_exports.asm
+        $(VBOX_PATH_CROGL_GENFILES)/solaris_exports.c
 VBoxOGL_CLEAN.win      = \
         $(VBOX_PATH_CROGL_GENFILES)/windows_exports.asm \
@@ -203 +221 @@
 if !defined(VBoxOGL_DRI) && !defined(VBoxOGL_FAKEDRI)
  ifeq ($(KBUILD_TARGET),solaris)
-$(VBOX_PATH_CROGL_GENFILES)/solaris_exports.asm: \
-                $(PATH_SUB_CURRENT)/SunOS_i386_exports.py \
+$(VBOX_PATH_CROGL_GENFILES)/solaris_exports.c: \
+                $(PATH_SUB_CURRENT)/SunOS_exports.py \
                 $(VBOX_CROGL_API_FILES) $(PATH_SUB_CURRENT)/entrypoints.py \
                 | $$(dir $$@)
@@ -238 +256 @@
 $(VBOX_PATH_CROGL_GENFILES)/cr_gl.h: $(PATH_SUB_CURRENT)/cr_gl.py $(VBOX_CROGL_API_FILES) | $$(dir $$@)
         $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI)
- ifeq ($(KBUILD_TARGET),solaris)
+ ifndef VBOX_OGL_GLX_USE_CSTUBS
+  ifeq ($(KBUILD_TARGET),solaris)
 $(VBOX_PATH_CROGL_GENFILES)/solaris_exports_dri.asm: \
                 $(PATH_SUB_CURRENT)/SunOS_i386_exports_dri.py \
@@ -246 +265 @@
 $(VBOX_PATH_CROGL_GENFILES)/solaris_glxapi_exports.asm: $(PATH_SUB_CURRENT)/SunOS_i386_glxapi_exports.py | $$(dir $$@)
         $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $<
- else
+  else
 $(VBOX_PATH_CROGL_GENFILES)/linux_exports_dri.asm: \
                 $(PATH_SUB_CURRENT)/Linux_i386_exports_dri.py \
@@ -254 +273 @@
 $(VBOX_PATH_CROGL_GENFILES)/linux_glxapi_exports.asm: $(PATH_SUB_CURRENT)/Linux_i386_glxapi_exports.py | $$(dir $$@)
         $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $<
- endif
+  endif
+ else
+  # @todo linux if required
+  ifeq ($(KBUILD_TARGET),solaris)
+$(VBOX_PATH_CROGL_GENFILES)/solaris_exports.c: \
+                $(PATH_SUB_CURRENT)/SunOS_exports.py \
+                $(VBOX_CROGL_API_FILES) $(PATH_SUB_CURRENT)/entrypoints.py \
+                | $$(dir $$@)
+        $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI)
+  endif
+ endif # VBOX_OGL_GLX_USE_CSTUBS
 endif
 endif