ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3d10core: Add a separate function for d3d10_texture2d initialization.

This commit is contained in:
Henri Verbeet 2009-09-11 19:01:15 +02:00 committed by Alexandre Julliard
parent 9ed19bc61a
commit 57b196b2e4
3 changed files with 56 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/d3d10core/d3d10core_private.h
View File

@ -82,7 +82,6 @@ struct d3d10_device
}; };
/* ID3D10Texture2D */ /* ID3D10Texture2D */
extern const struct ID3D10Texture2DVtbl d3d10_texture2d_vtbl;
struct d3d10_texture2d struct d3d10_texture2d
{ {
const struct ID3D10Texture2DVtbl *vtbl; const struct ID3D10Texture2DVtbl *vtbl;
@ -93,6 +92,9 @@ struct d3d10_texture2d
D3D10_TEXTURE2D_DESC desc; D3D10_TEXTURE2D_DESC desc;
}; };
HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_device *device,
const D3D10_TEXTURE2D_DESC *desc);
/* ID3D10Buffer */ /* ID3D10Buffer */
extern const struct ID3D10BufferVtbl d3d10_buffer_vtbl; extern const struct ID3D10BufferVtbl d3d10_buffer_vtbl;
struct d3d10_buffer struct d3d10_buffer

44
dlls/d3d10core/device.c
View File

@ -682,46 +682,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture2D(ID3D10Device *ifac
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
} }
object->vtbl = &d3d10_texture2d_vtbl; hr = d3d10_texture2d_init(object, This, desc);
object->refcount = 1; if (FAILED(hr))
object->desc = *desc;
if (desc->MipLevels == 1 && desc->ArraySize == 1)
{ {
IWineDXGIDevice *wine_device; WARN("Failed to initialize texture, hr %#x.\n", hr);
HeapFree(GetProcessHeap(), 0, object);
hr = ID3D10Device_QueryInterface(iface, &IID_IWineDXGIDevice, (void **)&wine_device); return hr;
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;
}
} }
*texture = (ID3D10Texture2D *)object; *texture = (ID3D10Texture2D *)object;

49
dlls/d3d10core/texture2d.c
View File

@ -161,7 +161,7 @@ static void STDMETHODCALLTYPE d3d10_texture2d_GetDesc(ID3D10Texture2D *iface, D3
*desc = This->desc; *desc = This->desc;
} }
const struct ID3D10Texture2DVtbl d3d10_texture2d_vtbl = static const struct ID3D10Texture2DVtbl d3d10_texture2d_vtbl =
{ {
/* IUnknown methods */ /* IUnknown methods */
d3d10_texture2d_QueryInterface, d3d10_texture2d_QueryInterface,
@ -181,3 +181,50 @@ const struct ID3D10Texture2DVtbl d3d10_texture2d_vtbl =
d3d10_texture2d_Unmap, d3d10_texture2d_Unmap,
d3d10_texture2d_GetDesc, 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;
}