VirtualBox

Changeset 34987 in vbox


Ignore:
Timestamp:
Dec 13, 2010 10:41:08 AM (14 years ago)
Author:
vboxsync
Message:

wddm/wine/3d: get rid of libWine, 64bit wine build (not tested yet), bugfixing

Location:
trunk/src/VBox/Additions/WINNT/Graphics
Files:
9 edited

Legend:

Unmodified
Added
Removed

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

    r34848 r34987  
    7272VBoxDispD3D_NOINST = true
    7373 endif
    74 VBoxDispD3D_NAME.amd64 = VBoxDispD3D64
    7574VBoxDispD3D_TEMPLATE = VBOXGUESTR3DLL
    7675VBoxDispD3D_DEFS     = UNICODE _UNICODE VBOX_WITH_WDDM VBOXWDDMDISP LOG_TO_BACKDOOR
    … …  
    9392 VBoxDispD3D_DEFS   += VBOXWDDM_TEST_UHGSMI
    9493endif
    95 VBoxDispD3D_SOURCES.x86  = \
    96         wddm/VBoxDispD3D.def
    97 VBoxDispD3D_SOURCES.amd64  = \
    98         wddm/VBoxDispD3D64.def
    9994VBoxDispD3D_SOURCES  = \
    10095        wddm/VBoxDispD3D.cpp \
    … …  
    10499        wddm/VBoxScreen.cpp \
    105100        wddm/VBoxDispMpTst.cpp \
    106         wddm/VBoxDispD3D.rc
     101        wddm/VBoxDispD3D.rc \
     102        wddm/VBoxDispD3D.def
    107103#ifdef VBOX_WITH_CRHGSMI
    108104#VBoxDispD3D_SOURCES += \
    … …  
    123119DLLS.amd64 += VBoxDispD3D-x86
    124120VBoxDispD3D-x86_EXTENDS = VBoxDispD3D
    125 VBoxDispD3D-x86_NAME = VBoxDispD3D
     121VBoxDispD3D-x86_NAME = VBoxDispD3D32
    126122VBoxDispD3D-x86_BLD_TRG_ARCH = x86
    127123VBoxDispD3D-x86_LIBS = \

  • trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxDispD3D.rc

    r32394 r34987  
    3838         VALUE "FileDescription",  "VirtualBox Video Usermode D3D 64bit Driver\0"
    3939         VALUE "FileVersion",      VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0"
    40          VALUE "InternalName",     "VBoxDispD3D64\0"
     40         VALUE "InternalName",     "VBoxDispD3D\0"
    4141         VALUE "LegalCopyright",   VBOX_RC_LEGAL_COPYRIGHT
    42          VALUE "OriginalFilename", "VBoxDispD3D64.dll\0"
     42         VALUE "OriginalFilename", "VBoxDispD3D.dll\0"
    4343         VALUE "ProductName",      VBOX_PRODUCT " Guest Additions\0"
    4444         VALUE "ProductVersion",   VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0"

  • trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxUhgsmiKmt.cpp

    r34894 r34987  
    583583    memset(&DDev, 0, sizeof (DDev));
    584584    DDev.cb = sizeof (DDev);
     585
     586    *phDc = NULL;
    585587
    586588    for (int i = 0; ; ++i)
    … …  
    623625{
    624626    D3DKMT_OPENADAPTERFROMHDC OpenAdapterData = {0};
    625     OpenAdapterData.hDc = GetWindowDC(NULL);
    626627    HRESULT hr = vboxDispKmtAdpHdcCreate(&OpenAdapterData.hDc);
    627     if (OpenAdapterData.hDc)
    628     {
     628    if (hr == S_OK)
     629    {
     630        Assert(OpenAdapterData.hDc);
    629631        NTSTATUS Status = pCallbacks->pfnD3DKMTOpenAdapterFromHdc(&OpenAdapterData);
    630632#ifdef DEBUG_misha

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

    r34805 r34987  
    2323include $(PATH_SUB_CURRENT)/Display/Makefile.kmk
    2424ifdef VBOX_WITH_CROGL
    25  ifeq ($(KBUILD_TARGET_ARCH),x86)
    26    include $(PATH_SUB_CURRENT)/Wine/Makefile.kmk
    27  endif
     25 include $(PATH_SUB_CURRENT)/Wine/Makefile.kmk
    2826endif
    2927
    … …  
    9088 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D.dll
    9189VBoxVideoWddm-inf_SOURCES.amd64 += \
    92  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D64.dll
     90 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D32.dll
    9391endif
    9492
    … …  
    106104 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu.dll
    107105VBoxVideoWddm-inf_SOURCES.amd64 += \
    108  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL64.dll \
    109  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D964.dll \
    110  $(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3d64.dll \
    111  $(PATH_TARGET)/VBoxVideoWddmCat.dir/libWine64.dll \
    112  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu64.dll \
    113  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil64.dll \
    114  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu64.dll \
    115  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu64.dll \
    116  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu64.dll \
    117  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu64.dll
     106 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL32.dll \
     107 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D9wddm32.dll \
     108 $(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3dwddm32.dll \
     109 $(PATH_TARGET)/VBoxVideoWddmCat.dir/libWine32.dll \
     110 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu32.dll \
     111 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil32.dll \
     112 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu32.dll \
     113 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu32.dll \
     114 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu32.dll \
     115 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu32.dll
    118116endif
    119117
    … …  
    134132
    135133ifdef VBOXWDDM_WITH_DISPD3D
    136 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D.dll: $$(TARGET_VBoxDispD3D$(if-expr "$(KBUILD_TARGET_ARCH)" == "amd64",-x86,)) | $$(call DIRDEP,$$(@D))
     134$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D.dll: $$(TARGET_VBoxDispD3D) | $$(call DIRDEP,$$(@D))
    137135        $(INSTALL) -m 644 $< $(@D)
    138136
    139137 ifeq ($(KBUILD_TARGET_ARCH),amd64)
    140 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D64.dll: $$(TARGET_VBoxDispD3D) | $$(call DIRDEP,$$(@D))
     138$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D32.dll: $$(TARGET_VBoxDispD3D-x86) | $$(call DIRDEP,$$(@D))
    141139        $(INSTALL) -m 644 $< $(@D)
    142140 endif
    … …  
    181179        $(INSTALL) -m 644 $< $(@D)
    182180
    183 $(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3d64.dll: $$(TARGET_wined3d64) | $$(call DIRDEP,$$(@D))
     181$(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3dwddm32.dll: $$(TARGET_wined3dwddm32) | $$(call DIRDEP,$$(@D))
    184182        $(INSTALL) -m 644 $< $(@D)
    185183
    … …  
    211209                $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxVideoWddm.sys \
    212210                $(if $(VBOXWDDM_WITH_DISPD3D), $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D.dll, ) \
    213                 $(if $(VBOXWDDM_WITH_DISPD3D), $(if-expr "$(KBUILD_TARGET_ARCH)" == "amd64", $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D64.dll, ), ) \
     211                $(if $(VBOXWDDM_WITH_DISPD3D), $(if-expr "$(KBUILD_TARGET_ARCH)" == "amd64", $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D32.dll, ), ) \
    214212                $(if $(VBOXWDDM_WITH_GL),  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL.dll \
    215213                                           $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D9wddm.dll \
    … …  
    223221                                           $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu.dll, ) \
    224222                $(if $(VBOXWDDM_WITH_GL), $(if-expr "$(KBUILD_TARGET_ARCH)" == "amd64", \
    225                                            $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL64.dll \
    226                                            $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D964.dll \
    227                                            $(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3d64.dll \
    228                                            $(PATH_TARGET)/VBoxVideoWddmCat.dir/libWine64.dll \
    229                                            $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu64.dll \
    230                                            $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil64.dll \
    231                                            $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu64.dll \
    232                                            $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu64.dll \
    233                                            $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu64.dll \
    234                                            $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu64.dll, ), )
     223                                           $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL32.dll \
     224                                           $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D9wddm32.dll \
     225                                           $(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3dwddm32.dll \
     226                                           $(PATH_TARGET)/VBoxVideoWddmCat.dir/libWine32.dll \
     227                                           $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu32.dll \
     228                                           $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil32.dll \
     229                                           $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu32.dll \
     230                                           $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu32.dll \
     231                                           $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu32.dll \
     232                                           $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu32.dll, ), )
    235233        $(call MSG_TOOL,Inf2Cat,VBoxVideoWddm-inf,$@,$<)
    236234        $(call VBOX_MAKE_CAT_FN, $(@D),$@)

  • trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoWddm.cpp

    r34429 r34987  
    12591259            DXGK_DRIVERCAPS *pCaps = (DXGK_DRIVERCAPS*)pQueryAdapterInfo->pOutputData;
    12601260
    1261             pCaps->HighestAcceptableAddress.HighPart = 0x0;
    1262             pCaps->HighestAcceptableAddress.LowPart = 0xffffffffUL;
     1261            pCaps->HighestAcceptableAddress.QuadPart = ~((uintptr_t)0);
    12631262            pCaps->MaxAllocationListSlotId = 16;
    12641263            pCaps->ApertureSegmentCommitLimit = 0;

  • trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoWddm.inf

    r32408 r34987  
    4949VBoxVideoWddm.sys
    5050
    51 ;x86   [VBoxVideo.Display]
    52 ;amd64 [VBoxVideo.Display_wow64]
     51[VBoxVideo.Display]
    5352;dispd3d VBoxDispD3D.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
    5453
    55 ;amd64 [VBoxVideo.Display]
    56 ;amd64 ;dispd3d VBoxDispD3D64.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
     54;amd64 [VBoxVideo.Display_wow64]
     55;amd64 ;dispd3d VBoxDispD3D32.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
    5756
    58 ;x86   [VBoxVideo.GL]
    59 ;amd64 [VBoxVideo.GL_wow64]
     57[VBoxVideo.GL]
    6058;gl VBoxOGL.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
    6159;gl VBoxD3D9wddm.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
    … …  
    6967;gl VBoxOGLpassthroughspu.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
    7068
    71 ;amd64 [VBoxVideo.GL]
    72 ;amd64 ;gl VBoxOGL64.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
    73 ;amd64 ;gl VBoxD3D964.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
    74 ;amd64 ;gl wined3d64.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
    75 ;amd64 ;gl libWine64.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
    76 ;amd64 ;gl VBoxOGLarrayspu64.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
    77 ;amd64 ;gl VBoxOGLcrutil64.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
    78 ;amd64 ;gl VBoxOGLerrorspu64.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
    79 ;amd64 ;gl VBoxOGLfeedbackspu64.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
    80 ;amd64 ;gl VBoxOGLpackspu64.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
    81 ;amd64 ;gl VBoxOGLpassthroughspu64.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
     69;amd64 [VBoxVideo.GL_wow64]
     70;amd64 ;gl VBoxOGL32.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
     71;amd64 ;gl VBoxD3D9wddm32.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
     72;amd64 ;gl wined3dwddm32.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
     73;amd64 ;gl libWine32.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
     74;amd64 ;gl VBoxOGLarrayspu32.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
     75;amd64 ;gl VBoxOGLcrutil32.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
     76;amd64 ;gl VBoxOGLerrorspu32.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
     77;amd64 ;gl VBoxOGLfeedbackspu32.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
     78;amd64 ;gl VBoxOGLpackspu32.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
     79;amd64 ;gl VBoxOGLpassthroughspu32.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
    8280
    8381[VBoxVideo_SoftwareDeviceSettings]
    84 ;x86   ;dispd3d HKR,, InstalledDisplayDrivers, %REG_MULTI_SZ%, VBoxDispD3D
    85 ;x86   ;dispd3d HKR,, UserModeDriverName,    %REG_MULTI_SZ%, VBoxDispD3D.dll
    86 ;amd64 ;dispd3d HKR,, InstalledDisplayDrivers, %REG_MULTI_SZ%, VBoxDispD3D64 VBoxDispD3D
    87 ;amd64 ;dispd3d HKR,, UserModeDriverName,    %REG_MULTI_SZ%, VBoxDispD3D64.dll
    88 ;amd64 ;dispd3d HKR,, UserModeDriverNameWow,    %REG_MULTI_SZ%, VBoxDispD3D.dll
    89 ;x86   ;gl HKR,, OpenGLDriverName,    %REG_MULTI_SZ%, VBoxOGL.dll
    90 ;amd64 ;gl HKR,, OpenGLDriverName,    %REG_MULTI_SZ%, VBoxOGL64.dll
    91 ;amd64 ;gl HKR,, OpenGLDriverNameWoW, %REG_MULTI_SZ%, VBoxOGL.dll
     82;dispd3d HKR,, InstalledDisplayDrivers, %REG_MULTI_SZ%, VBoxDispD3D
     83;dispd3d HKR,, UserModeDriverName,    %REG_MULTI_SZ%, VBoxDispD3D.dll
     84;amd64 ;dispd3d HKR,, UserModeDriverNameWow,    %REG_MULTI_SZ%, VBoxDispD3D32.dll
     85;gl HKR,, OpenGLDriverName,    %REG_MULTI_SZ%, VBoxOGL.dll
     86;amd64 ;gl HKR,, OpenGLDriverNameWoW, %REG_MULTI_SZ%, VBoxOGL32.dll
    9287;gl        HKR,, OpenGLFlags,         %REG_DWORD%,    0x00000001
    9388;amd64 ;gl HKR,, OpenGLFlagsWoW,      %REG_DWORD%,    0x00000001
    … …  
    9893[VBoxVideo_RegisterDlls]
    9994;dispd3d 11,,VBoxDispD3D.dll,1
    100 ;amd64 ;dispd3d 11,,VBoxDispD3D64.dll,1
    101 ;amd64 ;gl 11,,VBoxOGL64.dll,1
     95;amd64 ;dispd3d 11,,VBoxDispD3D32.dll,1
     96;amd64 ;gl 11,,VBoxOGL32.dll,1
    10297;gl 11,,VBoxOGL.dll,1
    103 ;amd64 ;gl 11,,VBoxD3D964.dll,1
     98;amd64 ;gl 11,,VBoxD3D9wddm32.dll,1
    10499;gl 11,,VBoxD3D9wddm.dll,1
    105 ;amd64 ;gl 11,,wined3d64.dll,1
     100;amd64 ;gl 11,,wined3dwddm32.dll,1
    106101;gl 11,,wined3dwddm.dll,1
    107 ;amd64 ;gl 11,,libWine64.dll,1
     102;amd64 ;gl 11,,libWine32.dll,1
    108103;gl 11,,libWine.dll,1
    109 ;amd64 ;gl 11,,VBoxOGLarrayspu64.dll,1
     104;amd64 ;gl 11,,VBoxOGLarrayspu32.dll,1
    110105;gl 11,,VBoxOGLarrayspu.dll,1
    111 ;amd64 ;gl 11,,VBoxOGLcrutil64.dll,1
     106;amd64 ;gl 11,,VBoxOGLcrutil32.dll,1
    112107;gl 11,,VBoxOGLcrutil.dll,1
    113 ;amd64 ;gl 11,,VBoxOGLerrorspu64.dll,1
     108;amd64 ;gl 11,,VBoxOGLerrorspu32.dll,1
    114109;gl 11,,VBoxOGLerrorspu.dll,1
    115 ;amd64 ;gl 11,,VBoxOGLfeedbackspu64.dll,1
     110;amd64 ;gl 11,,VBoxOGLfeedbackspu32.dll,1
    116111;gl 11,,VBoxOGLfeedbackspu.dll,1
    117 ;amd64 ;gl 11,,VBoxOGLpackspu64.dll,1
     112;amd64 ;gl 11,,VBoxOGLpackspu32.dll,1
    118113;gl 11,,VBoxOGLpackspu.dll,1
    119 ;amd64 ;gl 11,,VBoxOGLpassthroughspu64.dll,1
     114;amd64 ;gl 11,,VBoxOGLpassthroughspu32.dll,1
    120115;gl 11,,VBoxOGLpassthroughspu.dll,1
    121116
    … …  
    143138[SourceDisksFiles]
    144139VBoxVideoWddm.sys = 1
    145 ;amd64 ;dispd3d VBoxDispD3D64.dll = 1
     140;amd64 ;dispd3d VBoxDispD3D32.dll = 1
    146141;dispd3d VBoxDispD3D.dll = 1
    147 ;amd64 ;gl VBoxOGL64.dll = 1
     142;amd64 ;gl VBoxOGL32.dll = 1
    148143;gl VBoxOGL.dll = 1
    149 ;amd64 ;gl VBoxD3D964.dll = 1
     144;amd64 ;gl VBoxD3D9wddm32.dll = 1
    150145;gl VBoxD3D9wddm.dll = 1
    151 ;amd64 ;gl wined3d64.dll = 1
     146;amd64 ;gl wined3dwddm32.dll = 1
    152147;gl wined3dwddm.dll = 1
    153 ;amd64 ;gl libWine64.dll = 1
     148;amd64 ;gl libWine32.dll = 1
    154149;gl libWine.dll = 1
    155 ;amd64 ;gl VBoxOGLarrayspu64.dll = 1
     150;amd64 ;gl VBoxOGLarrayspu32.dll = 1
    156151;gl VBoxOGLarrayspu.dll = 1
    157 ;amd64 ;gl VBoxOGLcrutil64.dll = 1
     152;amd64 ;gl VBoxOGLcrutil32.dll = 1
    158153;gl VBoxOGLcrutil.dll = 1
    159 ;amd64 ;gl VBoxOGLerrorspu64.dll = 1
     154;amd64 ;gl VBoxOGLerrorspu32.dll = 1
    160155;gl VBoxOGLerrorspu.dll = 1
    161 ;amd64 ;gl VBoxOGLfeedbackspu64.dll = 1
     156;amd64 ;gl VBoxOGLfeedbackspu32.dll = 1
    162157;gl VBoxOGLfeedbackspu.dll = 1
    163 ;amd64 ;gl VBoxOGLpackspu64.dll = 1
     158;amd64 ;gl VBoxOGLpackspu32.dll = 1
    164159;gl VBoxOGLpackspu.dll = 1
    165 ;amd64 ;gl VBoxOGLpassthroughspu64.dll = 1
     160;amd64 ;gl VBoxOGLpassthroughspu32.dll = 1
    166161;gl VBoxOGLpassthroughspu.dll = 1
    167162

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

    r32622 r34987  
    2020include $(KBUILD_PATH)/subheader.kmk
    2121
    22 DLLS += libWine
     22DLLS.x86 += libWine
    2323
    2424libWine_TEMPLATE     = VBOXGUESTR3NPDLL
    … …  
    118118    libWine/version.c
    119119
    120 DLLS += wined3d
     120DLLS.x86 += wined3d
    121121
    122122wined3d_TEMPLATE     = VBOXGUESTR3NPDLL
    … …  
    129129    LIB_TO_DATADIR=\"\" \
    130130    BIN_TO_DATADIR=\"\"
    131 if "$(KBUILD_TYPE)" != "debug" || defined(DEBUG_misha)
     131if "$(KBUILD_TYPE)" != "debug" || defined(VBOX_WINE_NO_DEBUG_MSGS)
    132132 wined3d_DEFS        += WINE_NO_DEBUG_MSGS
    133133endif
    … …  
    178178 wined3dwddm_NOINST.win.x86 = true
    179179endif
    180 wined3dwddm_DEFS    += $(wined3d_DEFS) VBOX_WITH_WDDM
     180wined3dwddm_INCS     = vbox/libWineStub/include
     181wined3dwddm_LIBS     = $(NO_SUCH_VARIABLE)
     182wined3dwddm_DEFS     = $(subst __i386__,,$(wined3d_DEFS)) VBOX_WITH_WDDM VBOX_WINE_WITHOUT_LIBWINE
    181183wined3dwddm_SOURCES  = $(subst wined3d.def,wined3dwddm.def,$(wined3d_SOURCES))
    182 endif
    183 
    184 DLLS += VBoxD3D8
     184wined3dwddm_SOURCES += vbox/libWineStub/debug.c
     185wined3dwddm_SDKS     = WINDDKWLH
     186
     187DLLS.amd64 += wined3dwddm-x86
     188wined3dwddm-x86_EXTENDS = wined3dwddm
     189wined3dwddm-x86_NAME = wined3dwddm32
     190wined3dwddm-x86_BLD_TRG_ARCH = x86
     191#wined3dwddm-x86_LIBS = \
     192        $(VBOX_LIB_IPRT_GUEST_R3_X86) \
     193        $(VBOX_LIB_VBGL_R3_X86)
     194endif
     195
     196DLLS.x86 += VBoxD3D8
    185197
    186198VBoxD3D8_TEMPLATE     = VBOXGUESTR3NPDLL
    … …  
    193205    LIB_TO_DATADIR=\"\" \
    194206    BIN_TO_DATADIR=\"\"
    195 if "$(KBUILD_TYPE)" != "debug" || defined(DEBUG_misha)
     207if "$(KBUILD_TYPE)" != "debug" || defined(VBOX_WINE_NO_DEBUG_MSGS)
    196208 VBoxD3D8_DEFS       += WINE_NO_DEBUG_MSGS
    197209endif
    … …  
    219231    $(PATH_LIB)/libWine$(VBOX_SUFF_LIB) \
    220232    $(PATH_LIB)/wined3d$(VBOX_SUFF_LIB)
    221 DLLS += VBoxD3D9
     233DLLS.x86 += VBoxD3D9
    222234
    223235VBoxD3D9_TEMPLATE     = VBOXGUESTR3NPDLL
    … …  
    230242    LIB_TO_DATADIR=\"\" \
    231243    BIN_TO_DATADIR=\"\"
    232 if "$(KBUILD_TYPE)" != "debug" || defined(DEBUG_misha)
     244if "$(KBUILD_TYPE)" != "debug" || defined(VBOX_WINE_NO_DEBUG_MSGS)
    233245 VBoxD3D9_DEFS       += WINE_NO_DEBUG_MSGS
    234246endif
    … …  
    262274 VBoxD3D9wddm_NOINST.win.x86 = true
    263275endif
    264 VBoxD3D9wddm_DEFS += $(VBoxD3D9_DEFS) VBOX_WITH_WDDM IN_VBOXWINEEX
     276
     277VBoxD3D9wddm_INCS     = vbox/libWineStub/include
     278VBoxD3D9wddm_LIBS     = $(NO_SUCH_VARIABLE)
     279VBoxD3D9wddm_DEFS += $(subst __i386__,,$(VBoxD3D9_DEFS)) VBOX_WITH_WDDM VBOX_WINE_WITHOUT_LIBWINE IN_VBOXWINEEX
    265280VBoxD3D9wddm_SOURCES  = $(subst d3d9.def,d3d9wddm.def,$(VBoxD3D9_SOURCES))
    266 VBoxD3D9wddm_LIBS = $(subst wined3d$(VBOX_SUFF_LIB),wined3dwddm$(VBOX_SUFF_LIB),$(VBoxD3D9_LIBS))
    267 endif
    268 
    269 DLLS += d3d8
     281VBoxD3D9wddm_SOURCES += vbox/libWineStub/debug.c
     282VBoxD3D9wddm_LIBS = $(PATH_LIB)/wined3dwddm$(VBOX_SUFF_LIB)
     283VBoxD3D9wddm_SDKS     = WINDDKWLH
     284
     285DLLS.amd64 += VBoxD3D9wddm-x86
     286VBoxD3D9wddm-x86_EXTENDS = VBoxD3D9wddm
     287VBoxD3D9wddm-x86_NAME = VBoxD3D9wddm32
     288VBoxD3D9wddm-x86_BLD_TRG_ARCH = x86
     289VBoxD3D9wddm-x86_LIBS = $(PATH_LIB)/wined3dwddm32$(VBOX_SUFF_LIB)
     290#VBoxD3D9wddm-x86_LIBS += \
     291        $(VBOX_LIB_IPRT_GUEST_R3_X86) \
     292        $(VBOX_LIB_VBGL_R3_X86)
     293endif
     294
     295DLLS.x86 += d3d8
    270296d3d8_TEMPLATE      = VBOXGUESTR3NPDLL
    271297d3d8_DEFS          = __i386__
    … …  
    277303    switcher/d3d8.rc
    278304
    279 DLLS += d3d9
     305DLLS.x86 += d3d9
    280306d3d9_TEMPLATE      = VBOXGUESTR3NPDLL
    281307d3d9_DEFS          = __i386__

  • trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/vboxsharedrc.h

    r32184 r34987  
    3737#ifdef DEBUG_misha
    3838/* just for simplicity */
     39#ifdef RT_ARCH_X86
    3940#define AssertBreakpoint() do { __asm {int 3} } while (0)
     41#else
     42#define AssertBreakpoint() do { /* @todo */ } while (0)
     43#endif
    4044#define Assert(_expr) do { \
    4145        if (!(_expr)) AssertBreakpoint(); \

  • trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/wined3d_private.h

    r33836 r34987  
    4040#define NONAMELESSSTRUCT
    4141#define COBJMACROS
     42#ifndef VBOX_WINE_WITHOUT_LIBWINE
    4243#include "windef.h"
    4344#include "winbase.h"
    … …  
    4546#include "wingdi.h"
    4647#include "winuser.h"
     48#else
     49#include <windows.h>
     50#endif
    4751#include "wine/debug.h"
    4852#include "wine/unicode.h"
    4953
     54#ifndef VBOX_WINE_WITHOUT_LIBWINE
    5055#include "objbase.h"
     56#endif
    5157#include "wine/wined3d.h"
    5258#include "wined3d_gl.h"
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