Changeset 17472 in vbox

Timestamp:

Mar 6, 2009 2:03:46 PM (16 years ago)

Author:

vboxsync

Message:

crOpenGL: more dri related drafts

Location:

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

Files:

• Makefile.kmk (modified) (6 diffs)
• cr_gl.py (modified) (1 diff)

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

@@ -31 +31 @@
 DLLS += VBoxOGL VBoxOGLarrayspu VBoxOGLpassthroughspu VBoxOGLpackspu VBoxOGLfeedbackspu
 
+ifeq ($(KBUILD_TARGET),linux)
+ VBoxOGL_DRI = 1
+ VBOX_PATH_MESA_SOURCE = /usr/share/mesa-source
+endif
+
 #
 # VBoxOGL
@@ -36 +41 @@
 VBoxOGL_TEMPLATE       = VBOXCROGLR3GUESTDLL
 VBoxOGL_INCS           = .
+ifdef VBoxOGL_DRI
+ VBoxOGL_DEFS          += VBOXOGL_DRI IN_DRI_DRIVER
+ VBoxOGL_INCS          += \
+    $(VBOX_PATH_MESA_SOURCE) \
+    $(VBOX_PATH_MESA_SOURCE)/include \
+    $(VBOX_PATH_MESA_SOURCE)/src/mesa/ \
+    $(VBOX_PATH_MESA_SOURCE)/src/mesa/glapi \
+    $(VBOX_PATH_MESA_SOURCE)/src/mesa/main \
+    $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.5
+endif
 ifeq ($(KBUILD_TARGET),win)
 #fixme?, INTERMEDIATES.win ain't working
  VBoxOGL_INTERMEDIATES += $(VBOX_PATH_CROGL_GENFILES)/cr_gl.h
+endif
+ifdef VBoxOGL_DRI
+ VBoxOGL_INTERMEDIATES += \
+    $(VBOX_PATH_CROGL_GENFILES)/cr_gl.h \
+    $(VBOX_PATH_CROGL_GENFILES)/DD_gl.h
 endif
 VBoxOGL_SOURCES        = \
@@ -51 +71 @@
         xfont.c \
         $(VBOX_PATH_CROGL_GENFILES)/linux_exports.asm
+ifdef VBoxOGL_DRI
+ VBoxOGL_SOURCES.linux += \
+        $(VBOX_PATH_CROGL_GENFILES)/DD_gl.c \
+        dri_drv.c
+endif
 VBoxOGL_SOURCES.win    = \
         wgl.c \
@@ -66 +91 @@
         $(VBOX_PATH_CROGL_GENFILES)/windows_exports.asm \
         $(VBOX_PATH_CROGL_GENFILES)/cropengl.def
+ifdef VBoxOGL_DRI
+VBoxOGL_CLEAN.linux   += \
+    $(VBOX_PATH_CROGL_GENFILES)/cr_gl.h \
+    $(VBOX_PATH_CROGL_GENFILES)/DD_gl.h \
+    $(VBOX_PATH_CROGL_GENFILES)/DD_gl.c
+endif
 VBoxOGL_LIBS = \
         $(VBOX_LIB_IPRT_GUEST_R3) \
@@ -97 +128 @@
         $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI)
 else ifeq ($(KBUILD_TARGET),linux)
+ifndef VBoxOGL_DRI
 $(VBOX_PATH_CROGL_GENFILES)/getprocaddress.c: $(PATH_SUB_CURRENT)/getprocaddress.py $(VBOX_CROGL_API_FILES) | $$(dir $$@)
         $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI)
@@ -104 +136 @@
                 | $$(dir $$@)
         $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI)
+else
+$(VBOX_PATH_CROGL_GENFILES)/getprocaddress.c: $(PATH_SUB_CURRENT)/getprocaddress_dri.py $(VBOX_CROGL_API_FILES) | $$(dir $$@)
+        $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI)
+$(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)
+  $(VBOX_PATH_CROGL_GENFILES)/DD_gl.h: $(PATH_SUB_CURRENT)/DD_glh.py $(VBOX_CROGL_API_FILES) | $$(dir $$@)
+        $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI)
+  $(VBOX_PATH_CROGL_GENFILES)/DD_gl.c: $(PATH_SUB_CURRENT)/DD_glc.py $(VBOX_CROGL_API_FILES) | $$(dir $$@)
+        $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI)
+  $(VBOX_PATH_CROGL_GENFILES)/linux_exports.asm: \
+                $(PATH_SUB_CURRENT)/Linux_i386_exports_dri.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
 

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2008 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as