d3d10core: Convert between DXGI_FORMAT and WINED3DFORMAT values.

dlls/d3d10core/d3d10core_private.h

@@ -38,6 +38,9 @@
 const char *debug_d3d10_primitive_topology(D3D10_PRIMITIVE_TOPOLOGY topology);
 const char *debug_dxgi_format(DXGI_FORMAT format);
 
+DXGI_FORMAT dxgi_format_from_wined3dformat(WINED3DFORMAT format);
+WINED3DFORMAT wined3dformat_from_dxgi_format(DXGI_FORMAT format);
+
 /* IDirect3D10Device */
 extern const struct ID3D10DeviceVtbl d3d10_device_vtbl;
 extern const struct IUnknownVtbl d3d10_device_inner_unknown_vtbl;

dlls/d3d10core/device.c

@@ -632,10 +632,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture2D(ID3D10Device *ifac
         wined3d_device = IWineDXGIDevice_get_wined3d_device(wine_device);
         IWineDXGIDevice_Release(wine_device);
 
-        FIXME("Implement DXGI<->wined3d format and usage conversion\n");
+        FIXME("Implement DXGI<->wined3d usage conversion\n");
 
-        hr = IWineD3DDevice_CreateSurface(wined3d_device, desc->Width, desc->Height, desc->Format, FALSE,
-                FALSE, 0, &object->wined3d_surface, WINED3DRTYPE_SURFACE, desc->Usage, WINED3DPOOL_DEFAULT,
+        hr = IWineD3DDevice_CreateSurface(wined3d_device, desc->Width, desc->Height,
+                wined3dformat_from_dxgi_format(desc->Format), FALSE, FALSE, 0,
+                &object->wined3d_surface, WINED3DRTYPE_SURFACE, desc->Usage, WINED3DPOOL_DEFAULT,
                 desc->SampleDesc.Count, desc->SampleDesc.Quality, NULL, SURFACE_OPENGL, (IUnknown *)object);
         IWineD3DDevice_Release(wined3d_device);
         if (FAILED(hr))
@@ -1156,13 +1157,13 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateSurface(IWineD3DDeviceParen
             "\tpool %#x, level %u, face %u, surface %p partial stub!\n",
             iface, superior, width, height, format, usage, pool, level, face, surface);
 
-    FIXME("Implement DXGI<->wined3d format and usage conversion\n");
+    FIXME("Implement DXGI<->wined3d usage conversion\n");
 
     desc.Width = width;
     desc.Height = height;
     desc.MipLevels = 1;
     desc.ArraySize = 1;
-    desc.Format = format;
+    desc.Format = dxgi_format_from_wined3dformat(format);
     desc.SampleDesc.Count = 1;
     desc.SampleDesc.Quality = 0;
     desc.Usage = usage;
@@ -1195,13 +1196,13 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateRenderTarget(IWineD3DDevice
             "\tmultisample_quality %u, lockable %u, surface %p stub!\n",
             iface, superior, width, height, format, multisample_type, multisample_quality, lockable, surface);
 
-    FIXME("Implement DXGI<->wined3d format and usage conversion\n");
+    FIXME("Implement DXGI<->wined3d usage conversion\n");
 
     desc.Width = width;
     desc.Height = height;
     desc.MipLevels = 1;
     desc.ArraySize = 1;
-    desc.Format = format;
+    desc.Format = dxgi_format_from_wined3dformat(format);
     desc.SampleDesc.Count = multisample_type;
     desc.SampleDesc.Quality = multisample_quality;
     desc.Usage = D3D10_USAGE_DEFAULT;
@@ -1234,13 +1235,13 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateDepthStencilSurface(IWineD3
             "\tmultisample_quality %u, discard %u, surface %p stub!\n",
             iface, superior, width, height, format, multisample_type, multisample_quality, discard, surface);
 
-    FIXME("Implement DXGI<->wined3d format and usage conversion\n");
+    FIXME("Implement DXGI<->wined3d usage conversion\n");
 
     desc.Width = width;
     desc.Height = height;
     desc.MipLevels = 1;
     desc.ArraySize = 1;
-    desc.Format = format;
+    desc.Format = dxgi_format_from_wined3dformat(format);
     desc.SampleDesc.Count = multisample_type;
     desc.SampleDesc.Quality = multisample_quality;
     desc.Usage = D3D10_USAGE_DEFAULT;