Changeset 46662 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Wine_new

Timestamp:

Jun 19, 2013 2:22:29 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

86552

Message:

wddm/3d/wine: set host id impl

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new

Files:

• d3d9/d3d9wddm.def (modified) (1 diff)
• d3d9/surface.c (modified) (1 diff)
• vbox/VBoxWineEx.h (modified) (2 diffs)
• vbox/libWineStub/include/wine/wined3d.h (modified) (1 diff)
• wined3d/surface.c (modified) (1 diff)
• wined3d/wined3dwddm.def (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/d3d9/d3d9wddm.def

@@ -22 +22 @@
   VBoxWineExD3DDev9VolBlt
   VBoxWineExD3DDev9VolTexBlt
+  VBoxWineExD3DSurf9GetHostId

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/d3d9/surface.c

@@ -458 +458 @@
     return impl_from_IDirect3DSurface9(iface);
 }
+
+#ifdef VBOX_WITH_WDDM
+VBOXWINEEX_DECL(HRESULT) VBoxWineExD3DSurf9GetHostId(IDirect3DSurface9 *iface, uint32_t *pu32Id)
+{
+    struct d3d9_surface *surface = impl_from_IDirect3DSurface9(iface);
+    HRESULT hr;
+    wined3d_mutex_lock();
+    hr = wined3d_surface_get_host_id(surface->wined3d_surface, pu32Id);
+    wined3d_mutex_unlock();
+    return hr;
+}
+#endif

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/VBoxWineEx.h

@@ -78 +78 @@
 typedef FNVBOXWINEEXD3DDEV9_TERM *PFNVBOXWINEEXD3DDEV9_TERM;
 
+typedef VBOXWINEEX_DECL(HRESULT) FNVBOXWINEEXD3DSURF9_GETHOSTID(IDirect3DSurface9 *iface, uint32_t *pu32Id);
+typedef FNVBOXWINEEXD3DSURF9_GETHOSTID *PFNVBOXWINEEXD3DSURF9_GETHOSTID;
+
 typedef VBOXWINEEX_DECL(HRESULT) FNVBOXWINEEXD3DSWAPCHAIN9_PRESENT(IDirect3DSwapChain9 *iface, IDirect3DSurface9 *surf);
 typedef FNVBOXWINEEXD3DSWAPCHAIN9_PRESENT *PFNVBOXWINEEXD3DSWAPCHAIN9_PRESENT;
@@ -120 +123 @@
 VBOXWINEEX_DECL(HRESULT) VBoxWineExD3DDev9Term(IDirect3DDevice9Ex *iface);
 
+VBOXWINEEX_DECL(HRESULT) VBoxWineExD3DSurf9GetHostId(IDirect3DSurface9 *iface, uint32_t *pu32Id);
+
 VBOXWINEEX_DECL(HRESULT) VBoxWineExD3DSwapchain9Present(IDirect3DSwapChain9 *iface,
                                 IDirect3DSurface9 *surf); /* use the given surface as a frontbuffer content source */

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/libWineStub/include/wine/wined3d.h

@@ -2479 +2479 @@
 HRESULT __cdecl wined3d_device_blt_vol(struct wined3d_device *device, struct wined3d_volume *src, struct wined3d_volume *dst, const struct wined3d_box *pSrcBoxArg, const struct VBOXPOINT3D *pDstPoin3D);
 HRESULT __cdecl wined3d_device_blt_voltex(struct wined3d_device *device, struct wined3d_texture *src, struct wined3d_texture *dst, const struct wined3d_box *pSrcBoxArg, const struct VBOXPOINT3D *pDstPoin3D);
+HRESULT __cdecl wined3d_surface_get_host_id(struct wined3d_surface *surface, uint32_t *id);
 
 HRESULT __cdecl wined3d_swapchain_present_rt(struct wined3d_swapchain *swapchain, struct wined3d_surface *rt);
-
 #endif
 

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/surface.c

@@ -7767 +7767 @@
     return hr;
 }
+
+#ifdef VBOX_WITH_WDDM
+HRESULT CDECL wined3d_surface_get_host_id(struct wined3d_surface *surface, uint32_t *id)
+{
+    struct wined3d_texture *texture;
+    surface_internal_preload(surface, SRGB_RGB);
+
+    texture = surface->container;
+    if (texture && texture->level_count != 1 && texture->layer_count != 1)
+    {
+        ERR("unsupported level(%d) or layer(%d) count", texture->level_count, texture->layer_count);
+    }
+
+    if (!surface->texture_name)
+    {
+        ERR("no texture name!");
+        return E_FAIL;
+    }
+
+    *id = surface->texture_name;
+    return S_OK;
+}
+#endif

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/wined3dwddm.def

@@ -258 +258 @@
   wined3d_device_blt_voltex
   wined3d_swapchain_present_rt
-  
+  wined3d_surface_get_host_id