KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

st/nine: Fix aliasing states for stateblocks 

If NINE_STATE_FF_MATERIAL is set, the stateblock will upload
its recorded materials matrix.
If NINE_STATE_FF_LIGHTING is set, the lighting set is uploaded.

These flags could be set by a NineDevice9_SetTransform call
or by setting some states related to ff, but that shouldn't trigger
these stateblock behaviours.

We don't need to follow the context states dirtied by render states.
NINE_STATE_FF_VSTRANSF is exactly the state controlling stateblock
updates of transformation matrices, NINE_STATE_FF is too broad.

These two changes avoid setting the two mentionned states when we
shouldn't.

Fixes: https://github.com/iXit/Mesa-3D/issues/320

Signed-off-by: Axel Davy <davyaxel0@gmail.com>
This commit is contained in:
Axel Davy 2018-10-13 23:21:36 +02:00
parent 454201b452
commit 6f373b9b74
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gallium/state_trackers/nine/device9.c
View File

@ -2014,7 +2014,7 @@ NineDevice9_SetTransform( struct NineDevice9 *This,
*M = *pMatrix;
if (unlikely(This->is_recording)) {
state->ff.changed.transform[State / 32] |= 1 << (State % 32);
state->changed.group |= NINE_STATE_FF;
state->changed.group |= NINE_STATE_FF_VSTRANSF;
} else
nine_context_set_transform(This, State, pMatrix);
@ -2261,7 +2261,6 @@ NineDevice9_SetRenderState( struct NineDevice9 *This,
state->rs_advertised[State] = Value;
/* only need to record changed render states for stateblocks */
state->changed.rs[State / 32] |= 1 << (State % 32);
state->changed.group |= nine_render_state_group[State];
return D3D_OK;
}