VirtualBox

Ignore:
Timestamp:
Mar 23, 2015 11:20:58 AM (10 years ago)
Author:
vboxsync
Message:

Host 3D: Chromium server: add Expando SPU and DLM module in order to record and save OpenGL Display Lists (currently disabled).

Location:
trunk/src/VBox/HostServices/SharedOpenGL
Files:
24 added
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/HostServices/SharedOpenGL/Makefile.kmk

    r53852 r54905  
    2929        $(VBOX_PATH_CROGL_GENFILES)/
    3030endif
     31
     32ifeq ($(KBUILD_TARGET),darwin)
     33 #VBOX_WITH_CR_DISPLAY_LISTS=1
     34endif
     35
     36ifdef VBOX_WITH_CR_DISPLAY_LISTS
     37 LIBRARIES += VBoxOGLcrdlm
     38 DLLS      += VBoxOGLexpandospu
     39endif # VBOX_WITH_CR_DISPLAY_LISTS
    3140
    3241ifeq ($(KBUILD_TARGET),darwin)
    … …  
    155164        $(VBOX_PATH_CROGL_GENFILES)/server_simpleget.c \
    156165        $(VBOX_PATH_CROGL_GENFILES)/server_dispatch.h
     166ifdef VBOX_WITH_CR_DISPLAY_LISTS
     167VBoxOGLcrserverlib_DEFS += VBOX_WITH_CR_DISPLAY_LISTS
     168endif
    157169ifdef VBOXCR_LOGFPS
    158170VBoxOGLcrserverlib_DEFS += VBOXCR_LOGFPS
    … …  
    255267
    256268
     269ifdef VBOX_WITH_CR_DISPLAY_LISTS
     270#
     271# VBoxOGLcrdlm
     272#
     273
     274VBoxOGLcrdlm_TEMPLATE       = VBOXCROGLR3HOSTLIB
     275VBoxOGLcrdlm_INCS           = \
     276        dlm
     277VBoxOGLcrdlm_INTERMEDIATES  = \
     278        $(VBOX_PATH_CROGL_GENFILES)/cr_dlm.h \
     279        $(VBOX_PATH_CROGL_GENFILES)/dlm_generated.h
     280
     281VBoxOGLcrdlm_SOURCES  = \
     282        dlm/dlm.c \
     283        dlm/dlm_arrays.c \
     284        dlm/dlm_bbox.c \
     285        dlm/dlm_calllist.c \
     286        dlm/dlm_checklist.c \
     287        dlm/dlm_error.c \
     288        dlm/dlm_lists.c \
     289        dlm/dlm_pointers.c \
     290        $(VBOX_PATH_CROGL_GENFILES)/dlm_generated.c
     291
     292VBoxOGLcrdlm_CLEAN = \
     293        $(VBOX_PATH_CROGL_GENFILES)/dlm_generated.c \
     294        $(VBOX_PATH_CROGL_GENFILES)/cr_dlm.h \
     295        $(VBOX_PATH_CROGL_GENFILES)/dlm_generated.h
     296#
     297# Generate files for VBoxOGLcrdlm.
     298#
     299$(VBOX_PATH_CROGL_GENFILES)/cr_dlm.h: \
     300                $(addprefix $(PATH_SUB_CURRENT)/dlm/, dlm_header.py) \
     301                $(VBOX_CROGL_API_FILES) \
     302                | $$(dir $$@)
     303        $(call MSG_GENERATE,python,$@,$<)
     304        $(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< header $(VBOX_PATH_CROGL_GLAPI) > $@
     305
     306$(VBOX_PATH_CROGL_GENFILES)/dlm_generated.h: \
     307                $(addprefix $(PATH_SUB_CURRENT)/dlm/, dlm_generated.py dlm_special) \
     308                $(VBOX_PATH_CROGL_GENFILES)/cr_dlm.h \
     309                $(VBOX_CROGL_API_FILES) \
     310                | $$(dir $$@)
     311        $(call MSG_GENERATE,python,$@,$<)
     312        $(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< headers $(<D) $(VBOX_PATH_CROGL_GLAPI) > $@
     313
     314$(VBOX_PATH_CROGL_GENFILES)/dlm_generated.c: \
     315                $(addprefix $(PATH_SUB_CURRENT)/dlm/, dlm_generated.py dlm_special) \
     316                $(VBOX_PATH_CROGL_GENFILES)/dlm_generated.h \
     317                $(VBOX_CROGL_API_FILES) \
     318                | $$(dir $$@)
     319        $(call MSG_GENERATE,python,$@,$<)
     320        $(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< source $(<D) $(VBOX_PATH_CROGL_GLAPI) > $@
     321
     322
     323#
     324# VBoxOGLexpandospu
     325#
     326VBoxOGLexpandospu_TEMPLATE       = VBOXCROGLR3HOSTDLL
     327VBoxOGLexpandospu_INCS           = \
     328        expando
     329VBoxOGLexpandospu_SOURCES  = \
     330        expando/expandospu.c \
     331        expando/expandospu_config.c \
     332        expando/expandospu_init.c \
     333        $(VBOX_PATH_CROGL_GENFILES)/expando.c
     334VBoxOGLexpandospu_CLEAN = \
     335        $(VBOX_PATH_CROGL_GENFILES)/expando.c
     336VBoxOGLexpandospu_CLEAN = \
     337        $(VBOX_PATH_CROGL_GENFILES)/expando.c
     338VBoxOGLexpandospu_LDFLAGS.darwin += -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxOGLexpandospu.dylib
     339VBoxOGLexpandospu_LIBS = \
     340        $(PATH_STAGE_LIB)/VBoxOGLcrdlm$(VBOX_SUFF_LIB) \
     341        $(PATH_STAGE_LIB)/VBoxOGLhostcrstate$(VBOX_SUFF_LIB) \
     342        $(PATH_STAGE_LIB)/VBoxOGLhostspuload$(VBOX_SUFF_LIB) \
     343        $(VBOX_LIB_OGL_HOSTCRUTIL) \
     344        $(LIB_RUNTIME)
     345#
     346# Generate files for VBoxOGLexpandospu.
     347#
     348$(VBOX_PATH_CROGL_GENFILES)/expando.c: \
     349                $(addprefix $(PATH_SUB_CURRENT)/expando/, expando.py expando_special) \
     350                $(VBOX_CROGL_API_FILES) \
     351                | $$(dir $$@)
     352        $(call MSG_GENERATE,python,$@,$<)
     353        $(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI) $(<D) > $@
     354endif
     355
     356
    257357#
    258358# VBoxOGLrenderspu

  • trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_config.c

    r54507 r54905  
    116116    }
    117117
     118#ifdef VBOX_WITH_CR_DISPLAY_LISTS
     119    strcpy(response, "1 0 expando");
     120#else
    118121    strcpy(response, "1 0 render");
     122#endif
    119123    crDebug("CRServer: my SPU chain: %s", response);
    120124
    … …  
    286290    CRMuralInfo *defaultMural;
    287291
     292#ifdef VBOX_WITH_CR_DISPLAY_LISTS
     293    int spu_ids[1]     = {0};
     294    char *spu_names[1] = {"expando"};
     295#else
    288296    int spu_ids[1]     = {0};
    289297    char *spu_names[1] = {"render"};
     298#endif
    290299    char *spu_dir = NULL;
    291300    int i;

  • trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_main.c

    r54582 r54905  
    204204    if (!fContextsDeleted)
    205205    {
     206#ifndef VBOX_WITH_CR_DISPLAY_LISTS
    206207        /* sync our state with renderspu,
    207208         * do it before mural & context deletion to avoid deleting currently set murals/contexts*/
    208209        cr_server.head_spu->dispatch_table.MakeCurrent(CR_RENDER_DEFAULT_WINDOW_ID, 0, CR_RENDER_DEFAULT_CONTEXT_ID);
     210#endif
    209211    }
    210212

  • trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_init.c

    r53169 r54905  
    187187#ifdef CHROMIUM_THREADSAFE
    188188    crDebug("Render SPU: thread-safe");
     189    crInitTSD(&_RenderTSD);
    189190#endif
    190191
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