Module: wine Branch: master Commit: 57b196b2e41d8aed9f05d8b3fed188eabe61d79f URL: http://source.winehq.org/git/wine.git/?a=commit;h=57b196b2e41d8aed9f05d8b3fe...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Fri Sep 11 19:01:15 2009 +0200
d3d10core: Add a separate function for d3d10_texture2d initialization.
---
dlls/d3d10core/d3d10core_private.h | 4 ++- dlls/d3d10core/device.c | 44 +++---------------------------- dlls/d3d10core/texture2d.c | 49 +++++++++++++++++++++++++++++++++++- 3 files changed, 56 insertions(+), 41 deletions(-)
diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 3074bdb..4257b2e 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -82,7 +82,6 @@ struct d3d10_device };
/* ID3D10Texture2D */ -extern const struct ID3D10Texture2DVtbl d3d10_texture2d_vtbl; struct d3d10_texture2d { const struct ID3D10Texture2DVtbl *vtbl; @@ -93,6 +92,9 @@ struct d3d10_texture2d D3D10_TEXTURE2D_DESC desc; };
+HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_device *device, + const D3D10_TEXTURE2D_DESC *desc); + /* ID3D10Buffer */ extern const struct ID3D10BufferVtbl d3d10_buffer_vtbl; struct d3d10_buffer diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 3808dfb..9026b75 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -682,46 +682,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture2D(ID3D10Device *ifac return E_OUTOFMEMORY; }
- object->vtbl = &d3d10_texture2d_vtbl; - object->refcount = 1; - object->desc = *desc; - - if (desc->MipLevels == 1 && desc->ArraySize == 1) + hr = d3d10_texture2d_init(object, This, desc); + if (FAILED(hr)) { - IWineDXGIDevice *wine_device; - - hr = ID3D10Device_QueryInterface(iface, &IID_IWineDXGIDevice, (void **)&wine_device); - if (FAILED(hr)) - { - ERR("Device should implement IWineDXGIDevice\n"); - HeapFree(GetProcessHeap(), 0, object); - return E_FAIL; - } - - hr = IWineDXGIDevice_create_surface(wine_device, NULL, 0, NULL, - (IUnknown *)object, (void **)&object->dxgi_surface); - IWineDXGIDevice_Release(wine_device); - if (FAILED(hr)) - { - ERR("Failed to create DXGI surface, returning %#x\n", hr); - HeapFree(GetProcessHeap(), 0, object); - return hr; - } - - FIXME("Implement DXGI<->wined3d usage conversion\n"); - - hr = IWineD3DDevice_CreateSurface(This->wined3d_device, desc->Width, desc->Height, - wined3dformat_from_dxgi_format(desc->Format), FALSE, FALSE, 0, - &object->wined3d_surface, desc->Usage, WINED3DPOOL_DEFAULT, - desc->SampleDesc.Count > 1 ? desc->SampleDesc.Count : WINED3DMULTISAMPLE_NONE, - desc->SampleDesc.Quality, SURFACE_OPENGL, (IUnknown *)object); - if (FAILED(hr)) - { - ERR("CreateSurface failed, returning %#x\n", hr); - IDXGISurface_Release(object->dxgi_surface); - HeapFree(GetProcessHeap(), 0, object); - return hr; - } + WARN("Failed to initialize texture, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; }
*texture = (ID3D10Texture2D *)object; diff --git a/dlls/d3d10core/texture2d.c b/dlls/d3d10core/texture2d.c index 8119e19..edb2329 100644 --- a/dlls/d3d10core/texture2d.c +++ b/dlls/d3d10core/texture2d.c @@ -161,7 +161,7 @@ static void STDMETHODCALLTYPE d3d10_texture2d_GetDesc(ID3D10Texture2D *iface, D3 *desc = This->desc; }
-const struct ID3D10Texture2DVtbl d3d10_texture2d_vtbl = +static const struct ID3D10Texture2DVtbl d3d10_texture2d_vtbl = { /* IUnknown methods */ d3d10_texture2d_QueryInterface, @@ -181,3 +181,50 @@ const struct ID3D10Texture2DVtbl d3d10_texture2d_vtbl = d3d10_texture2d_Unmap, d3d10_texture2d_GetDesc, }; + +HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_device *device, + const D3D10_TEXTURE2D_DESC *desc) +{ + HRESULT hr; + + texture->vtbl = &d3d10_texture2d_vtbl; + texture->refcount = 1; + texture->desc = *desc; + + if (desc->MipLevels == 1 && desc->ArraySize == 1) + { + IWineDXGIDevice *wine_device; + + hr = ID3D10Device_QueryInterface((ID3D10Device *)device, &IID_IWineDXGIDevice, (void **)&wine_device); + if (FAILED(hr)) + { + ERR("Device should implement IWineDXGIDevice\n"); + return E_FAIL; + } + + hr = IWineDXGIDevice_create_surface(wine_device, NULL, 0, NULL, + (IUnknown *)texture, (void **)&texture->dxgi_surface); + IWineDXGIDevice_Release(wine_device); + if (FAILED(hr)) + { + ERR("Failed to create DXGI surface, returning %#x\n", hr); + return hr; + } + + FIXME("Implement DXGI<->wined3d usage conversion\n"); + + hr = IWineD3DDevice_CreateSurface(device->wined3d_device, desc->Width, desc->Height, + wined3dformat_from_dxgi_format(desc->Format), FALSE, FALSE, 0, + &texture->wined3d_surface, desc->Usage, WINED3DPOOL_DEFAULT, + desc->SampleDesc.Count > 1 ? desc->SampleDesc.Count : WINED3DMULTISAMPLE_NONE, + desc->SampleDesc.Quality, SURFACE_OPENGL, (IUnknown *)texture); + if (FAILED(hr)) + { + ERR("CreateSurface failed, returning %#x\n", hr); + IDXGISurface_Release(texture->dxgi_surface); + return hr; + } + } + + return S_OK; +}
-
Alexandre Julliard