Henri Verbeet : wined3d: Pass a wined3d_state structure to record_lights().
Alexandre Julliard
julliard at winehq.org
Mon Sep 27 11:29:39 CDT 2010
Module: wine
Branch: master
Commit: 8b54093bbc1cda8e31aa848642af351629064723
URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b54093bbc1cda8e31aa848642af351629064723
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Mon Sep 27 12:07:53 2010 +0200
wined3d: Pass a wined3d_state structure to record_lights().
---
dlls/wined3d/stateblock.c | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c
index 2523bcb..7e1cfe1 100644
--- a/dlls/wined3d/stateblock.c
+++ b/dlls/wined3d/stateblock.c
@@ -540,14 +540,15 @@ static ULONG WINAPI IWineD3DStateBlockImpl_Release(IWineD3DStateBlock *iface) {
/**********************************************************
* IWineD3DStateBlockImpl parts follows
**********************************************************/
-static void record_lights(IWineD3DStateBlockImpl *This, const IWineD3DStateBlockImpl *targetStateBlock)
+static void record_lights(IWineD3DStateBlockImpl *This, const struct wined3d_state *state)
{
UINT i;
/* Lights... For a recorded state block, we just had a chain of actions to perform,
* so we need to walk that chain and update any actions which differ
*/
- for(i = 0; i < LIGHTMAP_SIZE; i++) {
+ for (i = 0; i < LIGHTMAP_SIZE; ++i)
+ {
struct list *e, *f;
LIST_FOR_EACH(e, &This->state.light_map[i])
{
@@ -555,7 +556,7 @@ static void record_lights(IWineD3DStateBlockImpl *This, const IWineD3DStateBlock
struct wined3d_light_info *src = LIST_ENTRY(e, struct wined3d_light_info, entry), *realLight;
/* Look up the light in the destination */
- LIST_FOR_EACH(f, &targetStateBlock->state.light_map[i])
+ LIST_FOR_EACH(f, &state->light_map[i])
{
realLight = LIST_ENTRY(f, struct wined3d_light_info, entry);
if (realLight->OriginalIndex == src->OriginalIndex)
@@ -582,8 +583,8 @@ static void record_lights(IWineD3DStateBlockImpl *This, const IWineD3DStateBlock
{
/* This can happen if the light was originally created as a
* default light for SetLightEnable() while recording. */
- WARN("Light %u in stateblock %p does not exist in device stateblock %p.\n",
- src->OriginalIndex, This, targetStateBlock);
+ WARN("Light %u in stateblock %p does not exist in device state %p.\n",
+ src->OriginalIndex, This, state);
src->OriginalParms = WINED3D_default_light;
if (src->glIndex != -1)
@@ -887,7 +888,7 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface)
This->state.pixel_shader = targetStateBlock->state.pixel_shader;
}
- record_lights(This, targetStateBlock);
+ record_lights(This, &targetStateBlock->state);
TRACE("(%p) : Updated state block %p ------------------^\n", targetStateBlock, This);
More information about the wine-cvs
mailing list