Changeset 32425 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxDispD3D.h

Timestamp:

Sep 10, 2010 7:43:11 PM (14 years ago)

Author:

vboxsync

Message:

wddm/3d: multiple swapchain handling (needed for win7 & multi-screen)

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxDispD3D.h (modified) (8 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxDispD3D.h

@@ -23 +23 @@
 
 #define VBOXWDDMDISP_MAX_VERTEX_STREAMS 16
+#define VBOXWDDMDISP_MAX_SWAPCHAIN_SIZE 16
 
 #ifdef VBOX_WITH_VIDEOHWACCEL
@@ -91 +92 @@
 } VBOXWDDMDISP_INDICES_INFO;
 
-typedef struct VBOXWDDMDISP_SCREEN
-{
-    IDirect3DDevice9 *pDevice9If;
-    struct VBOXWDDMDISP_RESOURCE *pRenderTargetRc;
-//    struct VBOXWDDMDISP_RESOURCE *pDstSharedRc;
-    uint32_t iRenderTargetFrontBuf;
+typedef struct VBOXWDDMDISP_RENDERTGT_FLAGS
+{
+    union
+    {
+        struct
+        {
+            UINT bAdded : 1;
+            UINT bRemoved : 1;
+            UINT Reserved : 30;
+        };
+        uint32_t Value;
+    };
+}VBOXWDDMDISP_RENDERTGT_FLAGS;
+
+typedef struct VBOXWDDMDISP_RENDERTGT
+{
+    struct VBOXWDDMDISP_ALLOCATION *pAlloc;
+    UINT cNumFlips;
+    VBOXWDDMDISP_RENDERTGT_FLAGS fFlags;
+} VBOXWDDMDISP_RENDERTGT, *PVBOXWDDMDISP_RENDERTGT;
+
+#define VBOXWDDMDISP_INDEX_UNDEFINED (~0)
+typedef struct VBOXWDDMDISP_SWAPCHAIN_FLAGS
+{
+    union
+    {
+        struct
+        {
+            UINT bChanged : 1;
+            UINT bInited  : 1;
+            UINT Reserved : 30;
+        };
+        uint32_t Value;
+    };
+}VBOXWDDMDISP_SWAPCHAIN_FLAGS;
+
+typedef struct VBOXWDDMDISP_SWAPCHAIN
+{
+    RTLISTNODE ListEntry;
+    UINT iBB; /* Backbuffer index */
+    UINT cRTs; /* Number of render targets in the swapchain */
+    VBOXWDDMDISP_SWAPCHAIN_FLAGS fFlags;
+#ifndef VBOXWDDM_WITH_VISIBLE_FB
+    IDirect3DSurface9 *pRenderTargetFbCopy;
+#endif
+    IDirect3DSwapChain9 *pSwapChainIf;
     HWND hWnd;
-} VBOXWDDMDISP_SCREEN, *PVBOXWDDMDISP_SCREEN;
+    VBOXWDDMDISP_RENDERTGT aRTs[VBOXWDDMDISP_MAX_SWAPCHAIN_SIZE];
+} VBOXWDDMDISP_SWAPCHAIN, *PVBOXWDDMDISP_SWAPCHAIN;
+
+
+//typedef struct VBOXWDDMDISP_SCREEN
+//{
+//    RTLISTNODE SwapchainList;
+//    IDirect3DDevice9 *pDevice9If;
+////    struct VBOXWDDMDISP_RESOURCE *pDstSharedRc;
+//    uint32_t iRenderTargetFrontBuf;
+//    HWND hWnd;
+//} VBOXWDDMDISP_SCREEN, *PVBOXWDDMDISP_SCREEN;
 
 typedef struct VBOXWDDMDISP_DEVICE
@@ -104 +156 @@
     HANDLE hDevice;
     PVBOXWDDMDISP_ADAPTER pAdapter;
+    IDirect3DDevice9 *pDevice9If;
+    RTLISTNODE SwapchainList;
     UINT u32IfVersion;
     UINT uRtVersion;
@@ -110 +164 @@
     UINT cbCmdBuffer;
     D3DDDI_CREATEDEVICEFLAGS fFlags;
-#ifndef VBOXWDDM_WITH_VISIBLE_FB
-    IDirect3DSurface9 *pRenderTargetFbCopy;
-#endif
     /* number of StreamSources set */
     UINT cStreamSources;
@@ -128 +179 @@
     CRITICAL_SECTION DirtyAllocListLock;
     RTLISTNODE DirtyAllocList;
-
-    UINT iPrimaryScreen;
-    UINT cScreens;
-    VBOXWDDMDISP_SCREEN aScreens[VBOX_VIDEO_MAX_SCREENS];
 } VBOXWDDMDISP_DEVICE, *PVBOXWDDMDISP_DEVICE;
 
@@ -159 +206 @@
     D3DKMT_HANDLE hAllocation;
     VBOXWDDM_ALLOC_TYPE enmType;
+    struct VBOXWDDMDISP_RESOURCE *pRc;
     void* pvMem;
     /* object type is defined by enmD3DIfType enum */
@@ -169 +217 @@
     VBOXWDDM_DIRTYREGION DirtyRegion; /* <- dirty region to notify host about */
     VBOXWDDM_SURFACE_DESC SurfDesc;
+    PVBOXWDDMDISP_SWAPCHAIN pSwapchain;
 } VBOXWDDMDISP_ALLOCATION, *PVBOXWDDMDISP_ALLOCATION;
 
@@ -199 +248 @@
 #define VBOXDISP_D3DEV(_p) (_p)->pDevice9If
 #else
-#define VBOXDISP_D3DEV(_p) vboxWddmD3DDeviceGetPrimary(_p)
+#define VBOXDISP_D3DEV(_p) vboxWddmD3DDeviceGet(_p)
 #endif