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

wined3d: Remove IWineD3DStateBlock::InitStartupStateBlock() from the public wined3d interface.

This commit is contained in:
Henri Verbeet 2010-09-28 12:00:21 +02:00 committed by Alexandre Julliard
parent 67088eb34c
commit d6d345fa8a
4 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/wined3d/device.c
View File

@ -1888,7 +1888,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface,
/* Set up some starting GL setup */ /* Set up some starting GL setup */
/* Setup all the devices defaults */ /* Setup all the devices defaults */
IWineD3DStateBlock_InitStartupStateBlock((IWineD3DStateBlock *)This->stateBlock); stateblock_init_default_state(This->stateBlock);
context = context_acquire(This, swapchain->front_buffer); context = context_acquire(This, swapchain->front_buffer);
@ -6469,10 +6469,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice *iface,
This->updateStateBlock = This->stateBlock; This->updateStateBlock = This->stateBlock;
IWineD3DStateBlock_AddRef((IWineD3DStateBlock *)This->updateStateBlock); IWineD3DStateBlock_AddRef((IWineD3DStateBlock *)This->updateStateBlock);
hr = IWineD3DStateBlock_InitStartupStateBlock((IWineD3DStateBlock *) This->stateBlock); stateblock_init_default_state(This->stateBlock);
if(FAILED(hr)) {
ERR("Resetting the stateblock failed with error 0x%08x\n", hr);
}
if(wined3d_settings.offscreen_rendering_mode == ORM_FBO) if(wined3d_settings.offscreen_rendering_mode == ORM_FBO)
{ {

8
dlls/wined3d/stateblock.c
View File

@ -1078,9 +1078,8 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Apply(IWineD3DStateBlock *iface)
return WINED3D_OK; return WINED3D_OK;
} }
static HRESULT WINAPI IWineD3DStateBlockImpl_InitStartupStateBlock(IWineD3DStateBlock *iface) void stateblock_init_default_state(IWineD3DStateBlockImpl *stateblock)
{ {
IWineD3DStateBlockImpl *stateblock = (IWineD3DStateBlockImpl *)iface;
IWineD3DDeviceImpl *device = stateblock->device; IWineD3DDeviceImpl *device = stateblock->device;
const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info;
struct wined3d_state *state = &stateblock->state; struct wined3d_state *state = &stateblock->state;
@ -1097,7 +1096,7 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_InitStartupStateBlock(IWineD3DState
IWineD3DSurface *backbuffer; IWineD3DSurface *backbuffer;
HRESULT hr; HRESULT hr;
TRACE("iface %p.\n", iface); TRACE("stateblock %p.\n", stateblock);
stateblock->blockType = WINED3DSBT_INIT; stateblock->blockType = WINED3DSBT_INIT;
@ -1328,8 +1327,6 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_InitStartupStateBlock(IWineD3DState
} }
TRACE("Done.\n"); TRACE("Done.\n");
return WINED3D_OK;
} }
/********************************************************** /**********************************************************
@ -1345,7 +1342,6 @@ static const IWineD3DStateBlockVtbl IWineD3DStateBlock_Vtbl =
/* IWineD3DStateBlock */ /* IWineD3DStateBlock */
IWineD3DStateBlockImpl_Capture, IWineD3DStateBlockImpl_Capture,
IWineD3DStateBlockImpl_Apply, IWineD3DStateBlockImpl_Apply,
IWineD3DStateBlockImpl_InitStartupStateBlock
}; };
HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl *device, WINED3DSTATEBLOCKTYPE type) HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl *device, WINED3DSTATEBLOCKTYPE type)

1
dlls/wined3d/wined3d_private.h
View File

@ -2429,6 +2429,7 @@ struct IWineD3DStateBlockImpl
HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock,
IWineD3DDeviceImpl *device, WINED3DSTATEBLOCKTYPE type) DECLSPEC_HIDDEN; IWineD3DDeviceImpl *device, WINED3DSTATEBLOCKTYPE type) DECLSPEC_HIDDEN;
void stateblock_init_contained_states(IWineD3DStateBlockImpl *object) DECLSPEC_HIDDEN; void stateblock_init_contained_states(IWineD3DStateBlockImpl *object) DECLSPEC_HIDDEN;
void stateblock_init_default_state(IWineD3DStateBlockImpl *stateblock) DECLSPEC_HIDDEN;
static inline void stateblock_apply_state(DWORD state, IWineD3DStateBlockImpl *stateblock, static inline void stateblock_apply_state(DWORD state, IWineD3DStateBlockImpl *stateblock,
struct wined3d_context *context) struct wined3d_context *context)

2
include/wine/wined3d.idl
View File

@ -2647,8 +2647,6 @@ interface IWineD3DStateBlock : IUnknown
); );
HRESULT Apply( HRESULT Apply(
); );
HRESULT InitStartupStateBlock(
);
} }
[ [