VirtualBox

Changeset 68261 in vbox for trunk/src/VBox


Ignore:
Timestamp:
Aug 2, 2017 9:45:09 PM (7 years ago)
Author:
vboxsync
Message:

WDDM: helper libs. No code changes, just moved a couple of shared source files to a separate directory.

Location:
trunk/src/VBox
Files:
2 added
8 edited
4 moved

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk

    r67145 r68261  
    111111        .. \
    112112        $(VBOX_PATH_CROGL_INCLUDE) \
     113        $(PATH_ROOT)/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/shared \
    113114        $(VBOX_GRAPHICS_INCS)
    114115VBoxDispD3D_SOURCES  = \
    … …  
    116117        wddm/VBoxDispD3DIf.cpp \
    117118        wddm/VBoxDispCm.cpp \
    118         wddm/VBoxDispKmt.cpp \
    119119        wddm/VBoxDispDbg.cpp \
    120120        wddm/VBoxD3DIf.cpp \
    … …  
    129129        Psapi.lib \
    130130        $(VBOX_PATH_ADDITIONS_LIB)/VBoxDispMpLogger$(VBOX_SUFF_LIB) \
     131        $(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmKmt$(VBOX_SUFF_LIB) \
    131132        $(VBOX_PATH_ADDITIONS_LIB)/VBoxCrHgsmi$(VBOX_SUFF_LIB)
    132133
    … …  
    142143        Psapi.lib \
    143144        $(VBOX_PATH_ADDITIONS_LIB)/VBoxDispMpLogger-x86$(VBOX_SUFF_LIB) \
     145        $(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmKmt-x86$(VBOX_SUFF_LIB) \
    144146        $(VBOX_PATH_ADDITIONS_LIB)/VBoxCrHgsmi-x86$(VBOX_SUFF_LIB)
    145147VBoxDispD3D-x86_DEFS = $(VBoxDispD3D_DEFS) VBOX_WDDM_WOW64
    … …  
    158160        .. \
    159161        $(VBOX_PATH_CROGL_INCLUDE) \
     162        $(PATH_ROOT)/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/shared \
    160163        $(VBOX_GRAPHICS_INCS)
    161164VBoxCrHgsmi_SOURCES     = \
    162165        wddm/VBoxCrHgsmi.cpp \
    163         wddm/VBoxDispKmt.cpp \
    164166        wddm/VBoxDispDbg.cpp \
    165167        wddm/VBoxUhgsmiKmt.cpp \
    … …  
    177179endif #VBOX_WITH_CRHGSMI
    178180
    179 #
    180 # VBoxDispMpLogger - display backdoor logger library
    181 #
    182 LIBRARIES += VBoxDispMpLogger
    183 VBoxDispMpLogger_TEMPLATE    = VBoxGuestR3Lib
    184 VBoxDispMpLogger_SDKS        = ReorderCompilerIncs $(VBOX_WINDDK_GST_WLH)
    185 VBoxDispMpLogger_DEFS        = UNICODE _UNICODE VBOX_WITH_CRHGSMI IN_VBOXCRHGSMI VBOX_WITH_WDDM VBOX_WITH_VDMA VBOX_WITH_HGCM
    186 VBoxDispMpLogger_INCS        = ../../../include .. $(VBOX_GRAPHICS_INCS)
    187 VBoxDispMpLogger_SOURCES     = \
    188     wddm/VBoxDispMpLogger.cpp
    189 
    190 #
    191 # 64-bit systems needs a 32-bit version of VBoxCrHgsmi.
    192 #
    193 LIBRARIES.amd64 += VBoxDispMpLogger-x86
    194 VBoxDispMpLogger-x86_TEMPLATE    = VBoxGuestR3Lib
    195 VBoxDispMpLogger-x86_EXTENDS = VBoxDispMpLogger
    196 VBoxDispMpLogger-x86_BLD_TRG_ARCH = x86
    197 VBoxDispMpLogger-x86_DEFS = $(VBoxDispMpLogger_DEFS) VBOX_WDDM_WOW64
     181include $(PATH_SUB_CURRENT)/wddm/shared/Makefile.kmk
    198182
    199183endif #ifdef VBOX_WITH_WDDM

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispD3DCmn.h

    r62522 r68261  
    3434#include "VBoxDispCm.h"
    3535#include "VBoxDispMpInternal.h"
    36 #include "VBoxDispKmt.h"
     36#include <VBoxDispKmt.h>
    3737#ifdef VBOX_WITH_CRHGSMI
    3838#include "VBoxUhgsmiBase.h"

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispDbg.h

    r63105 r68261  
    186186}
    187187
    188 #include "VBoxDispMpLogger.h"
     188#include <VBoxDispMpLogger.h>
    189189
    190190VBOXDISPMPLOGGER_DECL(void) VBoxDispMpLoggerDumpD3DCAPS9(struct _D3DCAPS9 *pCaps);

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/shared/VBoxDispKmt.cpp

    r68260 r68261  
    1616 */
    1717
    18 #include "VBoxDispD3DBase.h"
    19 #include "VBoxDispKmt.h"
     18#include <../VBoxDispD3DBase.h>
     19#include <VBoxDispKmt.h>
    2020
    2121#include <iprt/assert.h>

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/shared/VBoxDispKmt.h

    r68260 r68261  
    2222#include <D3dkmthk.h>
    2323
    24 #include "../../common/wddm/VBoxMPIf.h"
     24#include <../../../common/wddm/VBoxMPIf.h>
    2525
    2626/* win8 release preview-specific stuff */

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/shared/VBoxDispMpLogger.cpp

    r68260 r68261  
    4444#       include <iprt/win/windows.h>
    4545#   endif
    46 #include "VBoxDispMpLogger.h"
     46#include <VBoxDispMpLogger.h>
    4747#include <d3d9types.h>
    4848#include <D3dumddi.h>
    4949#include <d3dhal.h>
    50 #include "../../common/wddm/VBoxMPIf.h"
    51 #include "VBoxDispKmt.h"
     50#include <../../../common/wddm/VBoxMPIf.h>
     51#include <VBoxDispKmt.h>
    5252
    5353#define VBOX_VIDEO_LOG_NAME "VBoxDispMpLogger"
    54 #include <common/VBoxVideoLog.h>
     54#include <../../../common/VBoxVideoLog.h>
    5555
    5656#include <iprt/asm.h>

  • trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/Makefile.kmk

    r66826 r68261  
    260260endif
    261261 wined3dwddm_INCS           = $(wined3d_INCS) \
     262        $(PATH_ROOT)/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/shared \
    262263        $(PATH_ROOT)/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm
    263264 wined3dwddm_SOURCES        = $(subst wined3d.def,wined3dwddm.def,$(subst wined3dxpdm.rc,wined3dwddm.rc,$(wined3d_SOURCES)))
    264265 wined3dwddm_LIBS           = $(wined3d_LIBS) \
    265266        $(VBOX_PATH_ADDITIONS_LIB)/VBoxDispMpLogger$(VBOX_SUFF_LIB) \
     267        $(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmKmt$(VBOX_SUFF_LIB) \
    266268        $(VBOX_PATH_ADDITIONS_LIB)/VBoxCrHgsmi$(VBOX_SUFF_LIB)
    267269
    … …  
    277279        $(VBOX_LIB_VBGL_R3_X86) \
    278280        $(VBOX_PATH_ADDITIONS_LIB)/VBoxDispMpLogger-x86$(VBOX_SUFF_LIB) \
     281        $(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmKmt-x86$(VBOX_SUFF_LIB) \
    279282        $(VBOX_PATH_ADDITIONS_LIB)/VBoxCrHgsmi-x86$(VBOX_SUFF_LIB) \
    280283        $(PATH_STAGE_LIB)/VBoxOGL-x86$(VBOX_SUFF_LIB)
    … …  
    367370 endif
    368371 VBoxD3D9wddm_INCS     = $(VBoxD3D9_INCS) \
     372        $(PATH_ROOT)/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/shared \
    369373        $(PATH_ROOT)/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm
    370374 VBoxD3D9wddm_DEFS    += $(VBoxD3D9_DEFS) \
    … …  
    376380        $(subst $(PATH_STAGE_LIB)/wined3d$(VBOX_SUFF_LIB),$(PATH_STAGE_LIB)/wined3dwddm$(VBOX_SUFF_LIB),$(VBoxD3D9_LIBS)) \
    377381        $(VBOX_PATH_ADDITIONS_LIB)/VBoxDispMpLogger$(VBOX_SUFF_LIB) \
     382        $(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmKmt$(VBOX_SUFF_LIB) \
    378383        $(VBOX_PATH_ADDITIONS_LIB)/VBoxCrHgsmi$(VBOX_SUFF_LIB)
    379384
    … …  
    391396 VBoxD3D9wddm-x86_LIBS        += \
    392397        $(VBOX_PATH_ADDITIONS_LIB)/VBoxDispMpLogger-x86$(VBOX_SUFF_LIB) \
     398        $(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmKmt-x86$(VBOX_SUFF_LIB) \
    393399        $(VBOX_PATH_ADDITIONS_LIB)/VBoxCrHgsmi-x86$(VBOX_SUFF_LIB)
    394400endif # VBOX_WITH_WDDM

  • trunk/src/VBox/Additions/WINNT/VBoxTray/Makefile.kmk

    r65381 r68261  
    2929        VBOX_WITH_HGCM \
    3030        VBOX_BUILD_TARGET=\"$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)\"
    31 VBoxTray_INCS     = ../include $(VBOX_GRAPHICS_INCS)
     31VBoxTray_INCS     = \
     32        ../include \
     33        $(PATH_ROOT)/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/shared \
     34        $(VBOX_GRAPHICS_INCS)
    3235VBoxTray_SOURCES  = \
    3336        VBoxTray.cpp \
    … …  
    6972 VBoxTray_DEFS   += VBOX_WITH_WDDM
    7073 # VBoxTray_DEFS   += LOG_ENABLED
    71  VBoxTray_SOURCES += ../Graphics/Video/disp/wddm/VBoxDispKmt.cpp
     74 VBoxTray_SOURCES += $(PATH_ROOT)/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/shared/VBoxDispKmt.cpp
    7275endif
    7376

  • trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDispIf.h

    r62522 r68261  
    2020# define D3DKMDT_SPECIAL_MULTIPLATFORM_TOOL
    2121# include <d3dkmthk.h>
    22 # include "../Graphics/Video/disp/wddm/VBoxDispKmt.h"
     22# include <VBoxDispKmt.h>
    2323#endif
    2424

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

    r65381 r68261  
    212212VBoxOGL_LIBS.win += \
    213213        $(PATH_STAGE_LIB)/additions/VBoxDispMpLogger$(VBOX_SUFF_LIB) \
     214        $(PATH_STAGE_LIB)/additions/VBoxWddmUmKmt$(VBOX_SUFF_LIB) \
    214215        $(PATH_STAGE_LIB)/additions/VBoxCrHgsmi$(VBOX_SUFF_LIB)
    215216
    … …  
    259260VBoxOGL-x86_LIBS.win += \
    260261        $(PATH_STAGE_LIB)/additions/VBoxDispMpLogger-x86$(VBOX_SUFF_LIB) \
     262        $(PATH_STAGE_LIB)/additions/VBoxWddmUmKmt-x86$(VBOX_SUFF_LIB) \
    261263        $(PATH_STAGE_LIB)/additions/VBoxCrHgsmi-x86$(VBOX_SUFF_LIB)
    262264
    … …  
    595597VBoxOGLpackspu_LIBS.win += \
    596598        $(PATH_STAGE_LIB)/additions/VBoxDispMpLogger$(VBOX_SUFF_LIB) \
     599        $(PATH_STAGE_LIB)/additions/VBoxWddmUmKmt$(VBOX_SUFF_LIB) \
    597600        $(PATH_STAGE_LIB)/additions/VBoxCrHgsmi$(VBOX_SUFF_LIB)
    598601
    … …  
    622625VBoxOGLpackspu-x86_LIBS.win += \
    623626        $(PATH_STAGE_LIB)/additions/VBoxDispMpLogger-x86$(VBOX_SUFF_LIB) \
     627        $(PATH_STAGE_LIB)/additions/VBoxWddmUmKmt-x86$(VBOX_SUFF_LIB) \
    624628        $(PATH_STAGE_LIB)/additions/VBoxCrHgsmi-x86$(VBOX_SUFF_LIB)
    625629VBoxOGLpackspu-x86_DEFS = $(VBoxOGLpackspu_DEFS) VBOX_WDDM_WOW64

  • trunk/src/VBox/GuestHost/OpenGL/Makefile.kmk

    r65381 r68261  
    110110ifdef VBOX_WITH_CRHGSMI
    111111VBoxOGLcrutil_DEFS.win    += VBOX_WITH_CRHGSMI
    112 VBoxOGLcrutil_LIBS.win    += $(VBOX_PATH_ADDITIONS_LIB)/VBoxCrHgsmi$(VBOX_SUFF_LIB)
     112VBoxOGLcrutil_LIBS.win    += \
     113        $(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmKmt$(VBOX_SUFF_LIB) \
     114        $(VBOX_PATH_ADDITIONS_LIB)/VBoxCrHgsmi$(VBOX_SUFF_LIB)
    113115endif
    114116ifdef VBOX_WITH_WDDM
    … …  
    143145ifdef VBOX_WITH_CRHGSMI
    144146# VBOX_WITH_CRHGSMI define is inherited from VBoxOGLcrutil
    145 VBoxOGLcrutil-x86_LIBS.win    += $(VBOX_PATH_ADDITIONS_LIB)/VBoxCrHgsmi-x86$(VBOX_SUFF_LIB)
     147VBoxOGLcrutil-x86_LIBS.win    += \
     148        $(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmKmt-x86$(VBOX_SUFF_LIB) \
     149        $(VBOX_PATH_ADDITIONS_LIB)/VBoxCrHgsmi-x86$(VBOX_SUFF_LIB)
    146150endif
    147151VBoxOGLcrutil-x86_DEFS = $(VBoxOGLcrutil_DEFS) VBOX_WDDM_WOW64
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