mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-31 10:41:12 +00:00
wined3d: Get rid of the shared_handle parameter.
I don't expect us to support this in the near future, and right now it's just dead code.
This commit is contained in:
parent
f88bd17ef6
commit
6f33b97c94
13 changed files with 59 additions and 110 deletions
|
@ -691,7 +691,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture2D(ID3D10Device *ifac
|
|||
wined3dformat_from_dxgi_format(desc->Format), FALSE, FALSE, 0,
|
||||
&object->wined3d_surface, WINED3DRTYPE_SURFACE, desc->Usage, WINED3DPOOL_DEFAULT,
|
||||
desc->SampleDesc.Count > 1 ? desc->SampleDesc.Count : WINED3DMULTISAMPLE_NONE,
|
||||
desc->SampleDesc.Quality, NULL, SURFACE_OPENGL, (IUnknown *)object);
|
||||
desc->SampleDesc.Quality, SURFACE_OPENGL, (IUnknown *)object);
|
||||
if (FAILED(hr))
|
||||
{
|
||||
ERR("CreateSurface failed, returning %#x\n", hr);
|
||||
|
|
|
@ -620,7 +620,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateTexture(LPDIRECT3DDEVICE8 iface
|
|||
object->ref = 1;
|
||||
EnterCriticalSection(&d3d8_cs);
|
||||
hrc = IWineD3DDevice_CreateTexture(This->WineD3DDevice, Width, Height, Levels, Usage & WINED3DUSAGE_MASK,
|
||||
wined3dformat_from_d3dformat(Format), Pool, &object->wineD3DTexture, NULL, (IUnknown *)object);
|
||||
wined3dformat_from_d3dformat(Format), Pool, &object->wineD3DTexture, (IUnknown *)object);
|
||||
LeaveCriticalSection(&d3d8_cs);
|
||||
|
||||
if (FAILED(hrc)) {
|
||||
|
@ -660,8 +660,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateVolumeTexture(LPDIRECT3DDEVICE8
|
|||
object->ref = 1;
|
||||
EnterCriticalSection(&d3d8_cs);
|
||||
hrc = IWineD3DDevice_CreateVolumeTexture(This->WineD3DDevice, Width, Height, Depth, Levels,
|
||||
Usage & WINED3DUSAGE_MASK, wined3dformat_from_d3dformat(Format), Pool,
|
||||
&object->wineD3DVolumeTexture, NULL, (IUnknown *)object);
|
||||
Usage & WINED3DUSAGE_MASK, wined3dformat_from_d3dformat(Format),
|
||||
Pool, &object->wineD3DVolumeTexture, (IUnknown *)object);
|
||||
LeaveCriticalSection(&d3d8_cs);
|
||||
|
||||
if (hrc != D3D_OK) {
|
||||
|
@ -701,7 +701,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateCubeTexture(LPDIRECT3DDEVICE8 i
|
|||
object->ref = 1;
|
||||
EnterCriticalSection(&d3d8_cs);
|
||||
hr = IWineD3DDevice_CreateCubeTexture(This->WineD3DDevice, EdgeLength, Levels, Usage & WINED3DUSAGE_MASK,
|
||||
wined3dformat_from_d3dformat(Format), Pool, &object->wineD3DCubeTexture, NULL, (IUnknown *)object);
|
||||
wined3dformat_from_d3dformat(Format), Pool, &object->wineD3DCubeTexture, (IUnknown *)object);
|
||||
LeaveCriticalSection(&d3d8_cs);
|
||||
|
||||
if (hr != D3D_OK){
|
||||
|
@ -738,8 +738,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateVertexBuffer(LPDIRECT3DDEVICE8
|
|||
object->ref = 1;
|
||||
EnterCriticalSection(&d3d8_cs);
|
||||
hrc = IWineD3DDevice_CreateVertexBuffer(This->WineD3DDevice, Size, Usage & WINED3DUSAGE_MASK,
|
||||
0 /* fvf for ddraw only */, (WINED3DPOOL) Pool, &(object->wineD3DVertexBuffer), NULL,
|
||||
(IUnknown *)object);
|
||||
0 /* fvf for ddraw only */, (WINED3DPOOL)Pool, &object->wineD3DVertexBuffer, (IUnknown *)object);
|
||||
LeaveCriticalSection(&d3d8_cs);
|
||||
object->fvf = FVF;
|
||||
|
||||
|
@ -777,8 +776,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateIndexBuffer(LPDIRECT3DDEVICE8 i
|
|||
TRACE("Calling wined3d create index buffer\n");
|
||||
EnterCriticalSection(&d3d8_cs);
|
||||
hrc = IWineD3DDevice_CreateIndexBuffer(This->WineD3DDevice, Length, Usage & WINED3DUSAGE_MASK,
|
||||
(WINED3DPOOL) Pool, &object->wineD3DIndexBuffer,
|
||||
NULL, (IUnknown *)object);
|
||||
(WINED3DPOOL)Pool, &object->wineD3DIndexBuffer, (IUnknown *)object);
|
||||
LeaveCriticalSection(&d3d8_cs);
|
||||
|
||||
if (D3D_OK != hrc) {
|
||||
|
@ -827,7 +825,7 @@ static HRESULT IDirect3DDevice8Impl_CreateSurface(LPDIRECT3DDEVICE8 iface, UINT
|
|||
EnterCriticalSection(&d3d8_cs);
|
||||
hrc = IWineD3DDevice_CreateSurface(This->WineD3DDevice, Width, Height, wined3dformat_from_d3dformat(Format),
|
||||
Lockable, Discard, Level, &object->wineD3DSurface, Type, Usage & WINED3DUSAGE_MASK,
|
||||
(WINED3DPOOL)Pool, MultiSample,MultisampleQuality, NULL, SURFACE_OPENGL, (IUnknown *)object);
|
||||
(WINED3DPOOL)Pool, MultiSample, MultisampleQuality, SURFACE_OPENGL, (IUnknown *)object);
|
||||
LeaveCriticalSection(&d3d8_cs);
|
||||
if (hrc != D3D_OK || NULL == object->wineD3DSurface) {
|
||||
/* free up object */
|
||||
|
@ -2651,7 +2649,7 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateVolume(IWineD3DDeviceParent
|
|||
object->lpVtbl = &Direct3DVolume8_Vtbl;
|
||||
object->ref = 1;
|
||||
hr = IWineD3DDevice_CreateVolume(This->WineD3DDevice, width, height, depth, usage,
|
||||
format, pool, &object->wineD3DVolume, NULL, (IUnknown *)object);
|
||||
format, pool, &object->wineD3DVolume, (IUnknown *)object);
|
||||
if (FAILED(hr))
|
||||
{
|
||||
ERR("(%p) CreateVolume failed, returning %#x\n", iface, hr);
|
||||
|
|
|
@ -365,8 +365,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateCubeTexture(LPDIRECT3DDEVICE9EX ifac
|
|||
object->ref = 1;
|
||||
EnterCriticalSection(&d3d9_cs);
|
||||
hr = IWineD3DDevice_CreateCubeTexture(This->WineD3DDevice, EdgeLength, Levels, Usage,
|
||||
wined3dformat_from_d3dformat(Format), Pool, &object->wineD3DCubeTexture,
|
||||
pSharedHandle, (IUnknown*)object);
|
||||
wined3dformat_from_d3dformat(Format), Pool, &object->wineD3DCubeTexture, (IUnknown *)object);
|
||||
LeaveCriticalSection(&d3d9_cs);
|
||||
|
||||
if (hr != D3D_OK){
|
||||
|
|
|
@ -678,8 +678,8 @@ static HRESULT IDirect3DDevice9Impl_CreateSurface(LPDIRECT3DDEVICE9EX iface, UIN
|
|||
|
||||
EnterCriticalSection(&d3d9_cs);
|
||||
hrc = IWineD3DDevice_CreateSurface(This->WineD3DDevice, Width, Height, wined3dformat_from_d3dformat(Format),
|
||||
Lockable, Discard, Level, &object->wineD3DSurface, Type, Usage & WINED3DUSAGE_MASK, (WINED3DPOOL)Pool,
|
||||
MultiSample, MultisampleQuality, pSharedHandle, SURFACE_OPENGL, (IUnknown *)object);
|
||||
Lockable, Discard, Level, &object->wineD3DSurface, Type, Usage & WINED3DUSAGE_MASK,
|
||||
(WINED3DPOOL)Pool, MultiSample, MultisampleQuality, SURFACE_OPENGL, (IUnknown *)object);
|
||||
LeaveCriticalSection(&d3d9_cs);
|
||||
|
||||
if (hrc != D3D_OK || NULL == object->wineD3DSurface) {
|
||||
|
@ -2099,7 +2099,7 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateVolume(IWineD3DDeviceParent
|
|||
object->lpVtbl = &Direct3DVolume9_Vtbl;
|
||||
object->ref = 1;
|
||||
hr = IWineD3DDevice_CreateVolume(This->WineD3DDevice, width, height, depth, usage & WINED3DUSAGE_MASK,
|
||||
format, pool, &object->wineD3DVolume, NULL, (IUnknown *)object);
|
||||
format, pool, &object->wineD3DVolume, (IUnknown *)object);
|
||||
if (FAILED(hr))
|
||||
{
|
||||
ERR("(%p) CreateVolume failed, returning %#x\n", iface, hr);
|
||||
|
|
|
@ -245,8 +245,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateIndexBuffer(LPDIRECT3DDEVICE9EX iface,
|
|||
TRACE("Calling wined3d create index buffer\n");
|
||||
EnterCriticalSection(&d3d9_cs);
|
||||
hrc = IWineD3DDevice_CreateIndexBuffer(This->WineD3DDevice, Length, Usage & WINED3DUSAGE_MASK,
|
||||
(WINED3DPOOL)Pool, &object->wineD3DIndexBuffer,
|
||||
pSharedHandle, (IUnknown *)object);
|
||||
(WINED3DPOOL)Pool, &object->wineD3DIndexBuffer, (IUnknown *)object);
|
||||
LeaveCriticalSection(&d3d9_cs);
|
||||
if (hrc != D3D_OK) {
|
||||
|
||||
|
|
|
@ -358,7 +358,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateTexture(LPDIRECT3DDEVICE9EX iface, U
|
|||
object->ref = 1;
|
||||
EnterCriticalSection(&d3d9_cs);
|
||||
hrc = IWineD3DDevice_CreateTexture(This->WineD3DDevice, Width, Height, Levels, Usage & WINED3DUSAGE_MASK,
|
||||
wined3dformat_from_d3dformat(Format), Pool, &object->wineD3DTexture, pSharedHandle, (IUnknown *)object);
|
||||
wined3dformat_from_d3dformat(Format), Pool, &object->wineD3DTexture, (IUnknown *)object);
|
||||
LeaveCriticalSection(&d3d9_cs);
|
||||
if (FAILED(hrc)) {
|
||||
|
||||
|
|
|
@ -248,8 +248,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexBuffer(LPDIRECT3DDEVICE9EX iface
|
|||
object->fvf = FVF;
|
||||
EnterCriticalSection(&d3d9_cs);
|
||||
hrc = IWineD3DDevice_CreateVertexBuffer(This->WineD3DDevice, Size, Usage & WINED3DUSAGE_MASK,
|
||||
0 /* fvf for ddraw only */, (WINED3DPOOL) Pool, &(object->wineD3DVertexBuffer),
|
||||
pSharedHandle, (IUnknown *)object);
|
||||
0 /* fvf for ddraw only */, (WINED3DPOOL) Pool, &(object->wineD3DVertexBuffer), (IUnknown *)object);
|
||||
LeaveCriticalSection(&d3d9_cs);
|
||||
|
||||
if (hrc != D3D_OK) {
|
||||
|
|
|
@ -431,8 +431,8 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateVolumeTexture(LPDIRECT3DDEVICE9EX if
|
|||
EnterCriticalSection(&d3d9_cs);
|
||||
|
||||
hrc = IWineD3DDevice_CreateVolumeTexture(This->WineD3DDevice, Width, Height, Depth, Levels,
|
||||
Usage & WINED3DUSAGE_MASK, wined3dformat_from_d3dformat(Format), Pool,
|
||||
&object->wineD3DVolumeTexture, pSharedHandle, (IUnknown *)object);
|
||||
Usage & WINED3DUSAGE_MASK, wined3dformat_from_d3dformat(Format),
|
||||
Pool, &object->wineD3DVolumeTexture, (IUnknown *)object);
|
||||
|
||||
LeaveCriticalSection(&d3d9_cs);
|
||||
|
||||
|
|
|
@ -1727,20 +1727,9 @@ IDirectDrawImpl_RecreateSurfacesCallback(IDirectDrawSurface7 *surf,
|
|||
}
|
||||
|
||||
/* Create the new surface */
|
||||
hr = IWineD3DDevice_CreateSurface(This->wineD3DDevice,
|
||||
Width, Height, Format,
|
||||
TRUE /* Lockable */,
|
||||
FALSE /* Discard */,
|
||||
surfImpl->mipmap_level,
|
||||
&surfImpl->WineD3DSurface,
|
||||
Type,
|
||||
Usage,
|
||||
Pool,
|
||||
MultiSampleType,
|
||||
MultiSampleQuality,
|
||||
0 /* SharedHandle */,
|
||||
This->ImplType,
|
||||
Parent);
|
||||
hr = IWineD3DDevice_CreateSurface(This->wineD3DDevice, Width, Height, Format,
|
||||
TRUE /* Lockable */, FALSE /* Discard */, surfImpl->mipmap_level, &surfImpl->WineD3DSurface,
|
||||
Type, Usage, Pool, MultiSampleType, MultiSampleQuality, This->ImplType, Parent);
|
||||
|
||||
if(hr != D3D_OK)
|
||||
return hr;
|
||||
|
@ -2036,21 +2025,9 @@ IDirectDrawImpl_CreateNewSurface(IDirectDrawImpl *This,
|
|||
}
|
||||
|
||||
/* Now create the WineD3D Surface */
|
||||
hr = IWineD3DDevice_CreateSurface(This->wineD3DDevice,
|
||||
pDDSD->dwWidth,
|
||||
pDDSD->dwHeight,
|
||||
Format,
|
||||
TRUE /* Lockable */,
|
||||
FALSE /* Discard */,
|
||||
level,
|
||||
&(*ppSurf)->WineD3DSurface,
|
||||
ResType, Usage,
|
||||
Pool,
|
||||
WINED3DMULTISAMPLE_NONE,
|
||||
0 /* MultiSampleQuality */,
|
||||
0 /* SharedHandle */,
|
||||
ImplType,
|
||||
Parent);
|
||||
hr = IWineD3DDevice_CreateSurface(This->wineD3DDevice, pDDSD->dwWidth, pDDSD->dwHeight, Format,
|
||||
TRUE /* Lockable */, FALSE /* Discard */, level, &(*ppSurf)->WineD3DSurface, ResType, Usage,
|
||||
Pool, WINED3DMULTISAMPLE_NONE, 0 /* MultiSampleQuality */, ImplType, Parent);
|
||||
|
||||
if(hr != D3D_OK)
|
||||
{
|
||||
|
@ -2725,15 +2702,13 @@ IDirectDrawImpl_CreateSurface(IDirectDraw7 *iface,
|
|||
*/
|
||||
if(desc2.ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP)
|
||||
{
|
||||
hr = IWineD3DDevice_CreateCubeTexture(This->wineD3DDevice, DDSD->dwWidth /* Edgelength */,
|
||||
levels, 0 /* usage */, Format, Pool, (IWineD3DCubeTexture **)&object->wineD3DTexture,
|
||||
0 /* SharedHandle */, (IUnknown *)object);
|
||||
hr = IWineD3DDevice_CreateCubeTexture(This->wineD3DDevice, DDSD->dwWidth /* Edgelength */, levels,
|
||||
0 /* usage */, Format, Pool, (IWineD3DCubeTexture **)&object->wineD3DTexture, (IUnknown *)object);
|
||||
}
|
||||
else
|
||||
{
|
||||
hr = IWineD3DDevice_CreateTexture(This->wineD3DDevice, DDSD->dwWidth, DDSD->dwHeight, levels,
|
||||
0 /* usage */, Format, Pool, (IWineD3DTexture **) &object->wineD3DTexture,
|
||||
0 /* SharedHandle */, (IUnknown *)object);
|
||||
0 /* usage */, Format, Pool, (IWineD3DTexture **)&object->wineD3DTexture, (IUnknown *)object);
|
||||
}
|
||||
This->tex_root = NULL;
|
||||
}
|
||||
|
|
|
@ -824,8 +824,7 @@ IDirect3DImpl_7_CreateDevice(IDirect3D7 *iface,
|
|||
* takes the pointer and avoids the memcpy
|
||||
*/
|
||||
hr = IWineD3DDevice_CreateIndexBuffer(This->wineD3DDevice, 0x40000 /* Length. Don't know how long it should be */,
|
||||
WINED3DUSAGE_DYNAMIC /* Usage */, WINED3DPOOL_DEFAULT,
|
||||
&object->indexbuffer, 0 /* Handle */, (IUnknown *)IndexBufferParent);
|
||||
WINED3DUSAGE_DYNAMIC /* Usage */, WINED3DPOOL_DEFAULT, &object->indexbuffer, (IUnknown *)IndexBufferParent);
|
||||
|
||||
if(FAILED(hr))
|
||||
{
|
||||
|
@ -1021,13 +1020,10 @@ IDirect3DImpl_7_CreateVertexBuffer(IDirect3D7 *iface,
|
|||
|
||||
EnterCriticalSection(&ddraw_cs);
|
||||
hr = IWineD3DDevice_CreateVertexBuffer(This->wineD3DDevice,
|
||||
get_flexible_vertex_size(Desc->dwFVF) * Desc->dwNumVertices,
|
||||
Desc->dwCaps & D3DVBCAPS_WRITEONLY ? WINED3DUSAGE_WRITEONLY : 0,
|
||||
Desc->dwFVF,
|
||||
Desc->dwCaps & D3DVBCAPS_SYSTEMMEMORY ? WINED3DPOOL_SYSTEMMEM : WINED3DPOOL_DEFAULT,
|
||||
&object->wineD3DVertexBuffer,
|
||||
0 /* SharedHandle */,
|
||||
(IUnknown *)object);
|
||||
get_flexible_vertex_size(Desc->dwFVF) * Desc->dwNumVertices,
|
||||
Desc->dwCaps & D3DVBCAPS_WRITEONLY ? WINED3DUSAGE_WRITEONLY : 0, Desc->dwFVF,
|
||||
Desc->dwCaps & D3DVBCAPS_SYSTEMMEMORY ? WINED3DPOOL_SYSTEMMEM : WINED3DPOOL_DEFAULT,
|
||||
&object->wineD3DVertexBuffer, (IUnknown *)object);
|
||||
if(hr != D3D_OK)
|
||||
{
|
||||
ERR("(%p) IWineD3DDevice::CreateVertexBuffer failed with hr=%08x\n", This, hr);
|
||||
|
|
|
@ -503,7 +503,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateBuffer(IWineD3DDevice *iface,
|
|||
}
|
||||
|
||||
static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexBuffer(IWineD3DDevice *iface, UINT Size, DWORD Usage,
|
||||
DWORD FVF, WINED3DPOOL Pool, IWineD3DBuffer **ppVertexBuffer, HANDLE *sharedHandle, IUnknown *parent)
|
||||
DWORD FVF, WINED3DPOOL Pool, IWineD3DBuffer **ppVertexBuffer, IUnknown *parent)
|
||||
{
|
||||
IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
|
||||
/* Dummy format for now */
|
||||
|
@ -582,9 +582,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexBuffer(IWineD3DDevice *ifac
|
|||
return WINED3D_OK;
|
||||
}
|
||||
|
||||
static HRESULT WINAPI IWineD3DDeviceImpl_CreateIndexBuffer(IWineD3DDevice *iface, UINT Length, DWORD Usage,
|
||||
WINED3DPOOL Pool, IWineD3DBuffer** ppIndexBuffer,
|
||||
HANDLE *sharedHandle, IUnknown *parent) {
|
||||
static HRESULT WINAPI IWineD3DDeviceImpl_CreateIndexBuffer(IWineD3DDevice *iface,
|
||||
UINT Length, DWORD Usage, WINED3DPOOL Pool, IWineD3DBuffer **ppIndexBuffer, IUnknown *parent)
|
||||
{
|
||||
IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
|
||||
const struct GlPixelFormatDesc *format_desc = getFormatDescEntry(WINED3DFMT_UNKNOWN, &This->adapter->gl_info);
|
||||
struct wined3d_buffer *object;
|
||||
|
@ -897,8 +897,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateStateBlock(IWineD3DDevice* iface,
|
|||
return WINED3D_OK;
|
||||
}
|
||||
|
||||
static HRESULT WINAPI IWineD3DDeviceImpl_CreateSurface(IWineD3DDevice *iface, UINT Width, UINT Height, WINED3DFORMAT Format, BOOL Lockable, BOOL Discard, UINT Level, IWineD3DSurface **ppSurface,WINED3DRESOURCETYPE Type, DWORD Usage, WINED3DPOOL Pool, WINED3DMULTISAMPLE_TYPE MultiSample ,DWORD MultisampleQuality, HANDLE* pSharedHandle, WINED3DSURFTYPE Impl, IUnknown *parent) {
|
||||
IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
|
||||
static HRESULT WINAPI IWineD3DDeviceImpl_CreateSurface(IWineD3DDevice *iface,
|
||||
UINT Width, UINT Height, WINED3DFORMAT Format, BOOL Lockable, BOOL Discard, UINT Level,
|
||||
IWineD3DSurface **ppSurface, WINED3DRESOURCETYPE Type, DWORD Usage, WINED3DPOOL Pool,
|
||||
WINED3DMULTISAMPLE_TYPE MultiSample, DWORD MultisampleQuality, WINED3DSURFTYPE Impl, IUnknown *parent)
|
||||
{
|
||||
IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
|
||||
IWineD3DSurfaceImpl *object; /*NOTE: impl ref allowed since this is a create function */
|
||||
unsigned int Size = 1;
|
||||
const struct GlPixelFormatDesc *glDesc = getFormatDescEntry(Format, &GLINFO_LOCATION);
|
||||
|
@ -1085,8 +1089,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateRendertargetView(IWineD3DDevice *
|
|||
}
|
||||
|
||||
static HRESULT WINAPI IWineD3DDeviceImpl_CreateTexture(IWineD3DDevice *iface,
|
||||
UINT Width, UINT Height, UINT Levels, DWORD Usage, WINED3DFORMAT Format, WINED3DPOOL Pool,
|
||||
IWineD3DTexture **ppTexture, HANDLE *pSharedHandle, IUnknown *parent)
|
||||
UINT Width, UINT Height, UINT Levels, DWORD Usage, WINED3DFORMAT Format,
|
||||
WINED3DPOOL Pool, IWineD3DTexture **ppTexture, IUnknown *parent)
|
||||
{
|
||||
IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
|
||||
const struct GlPixelFormatDesc *format_desc = getFormatDescEntry(Format, &This->adapter->gl_info);
|
||||
|
@ -1099,8 +1103,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateTexture(IWineD3DDevice *iface,
|
|||
unsigned int pow2Height;
|
||||
|
||||
TRACE("(%p) : Width %d, Height %d, Levels %d, Usage %#x\n", This, Width, Height, Levels, Usage);
|
||||
TRACE("Format %#x (%s), Pool %#x, ppTexture %p, pSharedHandle %p, parent %p\n",
|
||||
Format, debug_d3dformat(Format), Pool, ppTexture, pSharedHandle, parent);
|
||||
TRACE("Format %#x (%s), Pool %#x, ppTexture %p, parent %p\n",
|
||||
Format, debug_d3dformat(Format), Pool, ppTexture, parent);
|
||||
|
||||
/* TODO: It should only be possible to create textures for formats
|
||||
that are reported as supported */
|
||||
|
@ -1269,8 +1273,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateTexture(IWineD3DDevice *iface,
|
|||
}
|
||||
|
||||
static HRESULT WINAPI IWineD3DDeviceImpl_CreateVolumeTexture(IWineD3DDevice *iface,
|
||||
UINT Width, UINT Height, UINT Depth, UINT Levels, DWORD Usage, WINED3DFORMAT Format, WINED3DPOOL Pool,
|
||||
IWineD3DVolumeTexture **ppVolumeTexture, HANDLE *pSharedHandle, IUnknown *parent)
|
||||
UINT Width, UINT Height, UINT Depth, UINT Levels, DWORD Usage, WINED3DFORMAT Format,
|
||||
WINED3DPOOL Pool, IWineD3DVolumeTexture **ppVolumeTexture, IUnknown *parent)
|
||||
{
|
||||
IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
|
||||
const struct GlPixelFormatDesc *format_desc = getFormatDescEntry(Format, &This->adapter->gl_info);
|
||||
|
@ -1391,12 +1395,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVolumeTexture(IWineD3DDevice *ifa
|
|||
}
|
||||
|
||||
static HRESULT WINAPI IWineD3DDeviceImpl_CreateVolume(IWineD3DDevice *iface,
|
||||
UINT Width, UINT Height, UINT Depth,
|
||||
DWORD Usage,
|
||||
WINED3DFORMAT Format, WINED3DPOOL Pool,
|
||||
IWineD3DVolume** ppVolume,
|
||||
HANDLE* pSharedHandle, IUnknown *parent) {
|
||||
|
||||
UINT Width, UINT Height, UINT Depth, DWORD Usage, WINED3DFORMAT Format,
|
||||
WINED3DPOOL Pool, IWineD3DVolume **ppVolume, IUnknown *parent)
|
||||
{
|
||||
IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
|
||||
IWineD3DVolumeImpl *object; /** NOTE: impl ref allowed since this is a create function **/
|
||||
const struct GlPixelFormatDesc *format_desc = getFormatDescEntry(Format, &GLINFO_LOCATION);
|
||||
|
@ -1451,8 +1452,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVolume(IWineD3DDevice *iface,
|
|||
}
|
||||
|
||||
static HRESULT WINAPI IWineD3DDeviceImpl_CreateCubeTexture(IWineD3DDevice *iface,
|
||||
UINT EdgeLength, UINT Levels, DWORD Usage, WINED3DFORMAT Format, WINED3DPOOL Pool,
|
||||
IWineD3DCubeTexture **ppCubeTexture, HANDLE *pSharedHandle, IUnknown *parent)
|
||||
UINT EdgeLength, UINT Levels, DWORD Usage, WINED3DFORMAT Format,
|
||||
WINED3DPOOL Pool, IWineD3DCubeTexture **ppCubeTexture, IUnknown *parent)
|
||||
{
|
||||
IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
|
||||
const struct GlPixelFormatDesc *format_desc = getFormatDescEntry(Format, &This->adapter->gl_info);
|
||||
|
@ -2466,7 +2467,7 @@ static void IWineD3DDeviceImpl_LoadLogo(IWineD3DDeviceImpl *This, const char *fi
|
|||
|
||||
hr = IWineD3DDevice_CreateSurface((IWineD3DDevice *) This, bm.bmWidth, bm.bmHeight, WINED3DFMT_R5G6B5,
|
||||
TRUE, FALSE, 0, &This->logo_surface, WINED3DRTYPE_SURFACE, 0,
|
||||
WINED3DPOOL_DEFAULT, WINED3DMULTISAMPLE_NONE, 0, NULL, SURFACE_OPENGL, NULL);
|
||||
WINED3DPOOL_DEFAULT, WINED3DMULTISAMPLE_NONE, 0, SURFACE_OPENGL, NULL);
|
||||
if(FAILED(hr)) {
|
||||
ERR("Wine logo requested, but failed to create surface\n");
|
||||
goto out;
|
||||
|
|
|
@ -781,22 +781,11 @@ static IWineD3DSurfaceImpl *surface_convert_format(IWineD3DSurfaceImpl *source,
|
|||
return NULL;
|
||||
}
|
||||
|
||||
IWineD3DDevice_CreateSurface((IWineD3DDevice *) source->resource.wineD3DDevice,
|
||||
source->currentDesc.Width,
|
||||
source->currentDesc.Height,
|
||||
to_fmt,
|
||||
TRUE, /* lockable */
|
||||
TRUE, /* discard */
|
||||
0, /* level */
|
||||
&ret,
|
||||
WINED3DRTYPE_SURFACE,
|
||||
0, /* usage */
|
||||
WINED3DPOOL_SCRATCH,
|
||||
WINED3DMULTISAMPLE_NONE, /* TODO: Multisampled conversion */
|
||||
0, /* MultiSampleQuality */
|
||||
NULL, /* SharedHandle */
|
||||
IWineD3DSurface_GetImplType((IWineD3DSurface *) source),
|
||||
NULL); /* parent */
|
||||
IWineD3DDevice_CreateSurface((IWineD3DDevice *)source->resource.wineD3DDevice,
|
||||
source->currentDesc.Width, source->currentDesc.Height, to_fmt, TRUE /* lockable */,
|
||||
TRUE /* discard */, 0 /* level */, &ret, WINED3DRTYPE_SURFACE, 0 /* usage */,
|
||||
WINED3DPOOL_SCRATCH, WINED3DMULTISAMPLE_NONE /* TODO: Multisampled conversion */,
|
||||
0 /* MultiSampleQuality */, IWineD3DSurface_GetImplType((IWineD3DSurface *) source), NULL /* parent */);
|
||||
if(!ret) {
|
||||
ERR("Failed to create a destination surface for conversion\n");
|
||||
return NULL;
|
||||
|
|
|
@ -2886,7 +2886,6 @@ interface IWineD3DDevice : IWineD3DBase
|
|||
[in] DWORD fvf,
|
||||
[in] WINED3DPOOL pool,
|
||||
[out] IWineD3DBuffer **vertex_buffer,
|
||||
[in] HANDLE *shared_handle,
|
||||
[in] IUnknown *parent
|
||||
);
|
||||
HRESULT CreateIndexBuffer(
|
||||
|
@ -2894,7 +2893,6 @@ interface IWineD3DDevice : IWineD3DBase
|
|||
[in] DWORD usage,
|
||||
[in] WINED3DPOOL pool,
|
||||
[out] IWineD3DBuffer **index_buffer,
|
||||
[in] HANDLE *shared_handle,
|
||||
[in] IUnknown *parent
|
||||
);
|
||||
HRESULT CreateStateBlock(
|
||||
|
@ -2915,7 +2913,6 @@ interface IWineD3DDevice : IWineD3DBase
|
|||
[in] WINED3DPOOL pool,
|
||||
[in] WINED3DMULTISAMPLE_TYPE multisample_type,
|
||||
[in] DWORD multisample_quality,
|
||||
[in] HANDLE *shared_handle,
|
||||
[in] WINED3DSURFTYPE surface_type,
|
||||
[in] IUnknown *parent
|
||||
);
|
||||
|
@ -2932,7 +2929,6 @@ interface IWineD3DDevice : IWineD3DBase
|
|||
[in] WINED3DFORMAT format,
|
||||
[in] WINED3DPOOL pool,
|
||||
[out] IWineD3DTexture **texture,
|
||||
[in] HANDLE *shared_handle,
|
||||
[in] IUnknown *parent
|
||||
);
|
||||
HRESULT CreateVolumeTexture(
|
||||
|
@ -2944,7 +2940,6 @@ interface IWineD3DDevice : IWineD3DBase
|
|||
[in] WINED3DFORMAT format,
|
||||
[in] WINED3DPOOL pool,
|
||||
[out] IWineD3DVolumeTexture **texture,
|
||||
[in] HANDLE *shared_handle,
|
||||
[in] IUnknown *parent
|
||||
);
|
||||
HRESULT CreateVolume(
|
||||
|
@ -2955,7 +2950,6 @@ interface IWineD3DDevice : IWineD3DBase
|
|||
[in] WINED3DFORMAT format,
|
||||
[in] WINED3DPOOL pool,
|
||||
[out] IWineD3DVolume **volume,
|
||||
[in] HANDLE *shared_handle,
|
||||
[in] IUnknown *parent
|
||||
);
|
||||
HRESULT CreateCubeTexture(
|
||||
|
@ -2965,7 +2959,6 @@ interface IWineD3DDevice : IWineD3DBase
|
|||
[in] WINED3DFORMAT format,
|
||||
[in] WINED3DPOOL pool,
|
||||
[out] IWineD3DCubeTexture **texture,
|
||||
[in] HANDLE *shared_handle,
|
||||
[in] IUnknown *parent
|
||||
);
|
||||
HRESULT CreateQuery(
|
||||
|
|
Loading…
Reference in a new issue