VirtualBox

Changeset 17716 in vbox


Ignore:
Timestamp:
Mar 11, 2009 5:40:05 PM (16 years ago)
Author:
vboxsync
Message:

crOpenGL: fake dri driver, initial version

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r17619 r17716  
    4646
    4747ifeq ($(KBUILD_TARGET),linux)
    48  VBoxOGL_DRI = 1
    49  VBOX_PATH_MESA_SOURCE = $(VBOX_PATH_X11_ROOT)/mesa-7.2
     48 #VBoxOGL_DRI = 1
     49 VBoxOGL_FAKEDRI = 1
     50 #VBOX_PATH_MESA_SOURCE = $(VBOX_PATH_X11_ROOT)/mesa-7.2
     51 VBOX_PATH_MESA_SOURCE = /mnt/chost/Sun/Mesa-7.2
    5052endif
    5153
    … …  
    5658VBoxOGL_INCS           = .
    5759VBoxOGL_INCS.linux     = \
    58     $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \
    59     $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \
    60     $(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \
    61     $(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \
    62     $(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \
    63     $(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \
    64     $(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other
     60        $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \
     61        $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \
     62        $(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \
     63        $(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \
     64        $(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \
     65        $(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \
     66        $(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other
    6567ifdef VBoxOGL_DRI
    6668 VBoxOGL_DEFS          += VBOXOGL_DRI IN_DRI_DRIVER
    6769 VBoxOGL_INCS          += \
    68     $(VBOX_PATH_MESA_SOURCE) \
    69     $(VBOX_PATH_MESA_SOURCE)/include \
    70     $(VBOX_PATH_MESA_SOURCE)/src/mesa/ \
    71     $(VBOX_PATH_MESA_SOURCE)/src/mesa/glapi \
    72     $(VBOX_PATH_MESA_SOURCE)/src/mesa/main \
    73     $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.5
     70        $(VBOX_PATH_MESA_SOURCE) \
     71        $(VBOX_PATH_MESA_SOURCE)/include \
     72        $(VBOX_PATH_MESA_SOURCE)/src/mesa/ \
     73        $(VBOX_PATH_MESA_SOURCE)/src/mesa/glapi \
     74        $(VBOX_PATH_MESA_SOURCE)/src/mesa/main \
     75        $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.5
     76else ifdef VBoxOGL_FAKEDRI
     77 VBoxOGL_DEFS          += VBOXOGL_FAKEDRI
     78 VBoxOGL_INCS          += \
     79        $(VBOX_PATH_MESA_SOURCE) \
     80        $(VBOX_PATH_MESA_SOURCE)/include \
     81        $(VBOX_PATH_MESA_SOURCE)/src/mesa/ \
     82        $(VBOX_PATH_MESA_SOURCE)/src/mesa/glapi \
     83        $(VBOX_PATH_MESA_SOURCE)/src/mesa/main \
     84        $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.5
    7485endif
    7586ifeq ($(KBUILD_TARGET),win)
    … …  
    7990ifdef VBoxOGL_DRI
    8091 VBoxOGL_INTERMEDIATES += \
    81     $(VBOX_PATH_CROGL_GENFILES)/cr_gl.h \
    82     $(VBOX_PATH_CROGL_GENFILES)/DD_gl.h
     92        $(VBOX_PATH_CROGL_GENFILES)/cr_gl.h \
     93        $(VBOX_PATH_CROGL_GENFILES)/DD_gl.h
     94else ifdef VBoxOGL_FAKEDRI
     95 VBoxOGL_INTERMEDIATES += \
     96        $(VBOX_PATH_CROGL_GENFILES)/cr_gl.h
    8397endif
    8498VBoxOGL_SOURCES        = \
    … …  
    97111        $(VBOX_PATH_CROGL_GENFILES)/DD_gl.c \
    98112        dri_drv.c
     113else ifdef VBoxOGL_FAKEDRI
     114 VBoxOGL_SOURCES.linux += \
     115        $(VBOX_PATH_CROGL_GENFILES)/linux_glxapi_exports.asm \
     116        fakedri_drv.c
    99117endif
    100118VBoxOGL_SOURCES.win    = \
    … …  
    114132        $(VBOX_PATH_CROGL_GENFILES)/cropengl.def
    115133ifdef VBoxOGL_DRI
    116 VBoxOGL_CLEAN.linux   += \
    117     $(VBOX_PATH_CROGL_GENFILES)/cr_gl.h \
    118     $(VBOX_PATH_CROGL_GENFILES)/DD_gl.h \
    119     $(VBOX_PATH_CROGL_GENFILES)/DD_gl.c
     134 VBoxOGL_CLEAN.linux   += \
     135        $(VBOX_PATH_CROGL_GENFILES)/cr_gl.h \
     136        $(VBOX_PATH_CROGL_GENFILES)/DD_gl.h \
     137        $(VBOX_PATH_CROGL_GENFILES)/DD_gl.c
     138else ifdef VBoxOGL_FAKEDRI
     139 VBoxOGL_CLEAN.linux   += \
     140        $(VBOX_PATH_CROGL_GENFILES)/cr_gl.h \
     141        $(VBOX_PATH_CROGL_GENFILES)/linux_glxapi_exports.asm
    120142endif
    121143VBoxOGL_LIBS = \
    … …  
    127149 VBoxOGL_LIBS += \
    128150        $(PATH_LIB)/libXcomposite.so
     151 ifdef VBoxOGL_FAKEDRI
     152  VBoxOGL_LIBS += \
     153        dl
     154 endif
    129155endif
    130156
    … …  
    150176        $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI)
    151177else ifeq ($(KBUILD_TARGET),linux)
    152 ifndef VBoxOGL_DRI
     178if !defined(VBoxOGL_DRI) && !defined(VBoxOGL_FAKEDRI)
    153179$(VBOX_PATH_CROGL_GENFILES)/getprocaddress.c: $(PATH_SUB_CURRENT)/getprocaddress.py $(VBOX_CROGL_API_FILES) | $$(dir $$@)
    154180        $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI)
    … …  
    158184                | $$(dir $$@)
    159185        $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI)
    160 else
     186else ifdef VBoxOGL_DRI
    161187$(VBOX_PATH_CROGL_GENFILES)/getprocaddress.c: $(PATH_SUB_CURRENT)/getprocaddress_dri.py $(VBOX_CROGL_API_FILES) | $$(dir $$@)
    162188        $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI)
    163189$(VBOX_PATH_CROGL_GENFILES)/cr_gl.h: $(PATH_SUB_CURRENT)/cr_gl.py $(VBOX_CROGL_API_FILES) | $$(dir $$@)
    164190        $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI)
    165   $(VBOX_PATH_CROGL_GENFILES)/DD_gl.h: $(PATH_SUB_CURRENT)/DD_glh.py $(VBOX_CROGL_API_FILES) | $$(dir $$@)
    166         $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI)
    167   $(VBOX_PATH_CROGL_GENFILES)/DD_gl.c: $(PATH_SUB_CURRENT)/DD_glc.py $(VBOX_CROGL_API_FILES) | $$(dir $$@)
    168         $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI)
    169   $(VBOX_PATH_CROGL_GENFILES)/linux_exports.asm: \
     191$(VBOX_PATH_CROGL_GENFILES)/DD_gl.h: $(PATH_SUB_CURRENT)/DD_glh.py $(VBOX_CROGL_API_FILES) | $$(dir $$@)
     192        $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI)
     193$(VBOX_PATH_CROGL_GENFILES)/DD_gl.c: $(PATH_SUB_CURRENT)/DD_glc.py $(VBOX_CROGL_API_FILES) | $$(dir $$@)
     194        $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI)
     195$(VBOX_PATH_CROGL_GENFILES)/linux_exports.asm: \
    170196                $(PATH_SUB_CURRENT)/Linux_i386_exports_dri.py \
    171197                $(VBOX_CROGL_API_FILES) $(PATH_SUB_CURRENT)/entrypoints.py \
    172198                | $$(dir $$@)
    173199        $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI)
     200else ifdef VBoxOGL_FAKEDRI
     201$(VBOX_PATH_CROGL_GENFILES)/getprocaddress.c: $(PATH_SUB_CURRENT)/getprocaddress_dri.py $(VBOX_CROGL_API_FILES) | $$(dir $$@)
     202        $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI)
     203$(VBOX_PATH_CROGL_GENFILES)/cr_gl.h: $(PATH_SUB_CURRENT)/cr_gl.py $(VBOX_CROGL_API_FILES) | $$(dir $$@)
     204        $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI)
     205$(VBOX_PATH_CROGL_GENFILES)/linux_exports.asm: \
     206                $(PATH_SUB_CURRENT)/Linux_i386_exports_dri.py \
     207                $(VBOX_CROGL_API_FILES) $(PATH_SUB_CURRENT)/entrypoints.py \
     208                | $$(dir $$@)
     209        $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI)
     210$(VBOX_PATH_CROGL_GENFILES)/linux_glxapi_exports.asm: $(PATH_SUB_CURRENT)/Linux_i386_glxapi_exports.py | $$(dir $$@)
     211        $(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $<
    174212endif
    175213endif
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette