Changeset 20612 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8

Timestamp:

Jun 16, 2009 9:20:54 AM (16 years ago)

Author:

vboxsync

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

48670

Message:

crOpenGL: update wine to 1.1.23

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8

Files:

• d3d8.def (modified) (1 diff)
• device.c (modified) (3 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/d3d8.def

@@ -1 +1 @@
 ; File generated automatically from ../../../dlls/d3d8/d3d8.spec; do not edit!
 
-LIBRARY d3d8.dll
+LIBRARY VBoxD3D8.dll
 
 EXPORTS

trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/device.c

@@ -1736 +1736 @@
     HRESULT hrc = D3D_OK;
     IDirect3DVertexShader8Impl *object;
-    IWineD3DVertexDeclaration *wined3d_vertex_declaration;
     const DWORD *token = pDeclaration;
     DWORD handle;
@@ -1793 +1792 @@
     }
 
-    wined3d_vertex_declaration = ((IDirect3DVertexDeclaration8Impl *)object->vertex_declaration)->wined3d_vertex_declaration;
-
     if (pFunction)
     {
         /* Usage is missing ... Use SetRenderState to set the sw vp render state in SetVertexShader */
-        hrc = IWineD3DDevice_CreateVertexShader(This->WineD3DDevice, wined3d_vertex_declaration,
-                pFunction, &object->wineD3DVertexShader, (IUnknown *)object);
+        hrc = IWineD3DDevice_CreateVertexShader(This->WineD3DDevice, pFunction,
+                NULL /* output signature */, &object->wineD3DVertexShader, (IUnknown *)object);
 
         if (FAILED(hrc))
@@ -2176 +2173 @@
     EnterCriticalSection(&d3d8_cs);
     hr = IWineD3DDevice_CreatePixelShader(This->WineD3DDevice, pFunction,
-            &object->wineD3DPixelShader, (IUnknown *)object);
+            NULL, &object->wineD3DPixelShader, (IUnknown *)object);
     if (FAILED(hr))
     {