diff options
author | Axel Davy <[email protected]> | 2016-10-19 23:36:50 +0200 |
---|---|---|
committer | Axel Davy <[email protected]> | 2016-12-20 23:44:22 +0100 |
commit | bb62ea925a9aaebb053f0df14a9b7c995fdb6537 (patch) | |
tree | eaf260d9fe1f934402e58679b54568d838532d16 /src/gallium/state_trackers/nine/device9.c | |
parent | cbe370020e4e2b6293230bf0908f3f199c2468eb (diff) |
st/nine: Refactor LightEnable
Call a helper function.
Signed-off-by: Axel Davy <[email protected]>
Diffstat (limited to 'src/gallium/state_trackers/nine/device9.c')
-rw-r--r-- | src/gallium/state_trackers/nine/device9.c | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/src/gallium/state_trackers/nine/device9.c b/src/gallium/state_trackers/nine/device9.c index 74c1bea7857..3fd1cdffab9 100644 --- a/src/gallium/state_trackers/nine/device9.c +++ b/src/gallium/state_trackers/nine/device9.c @@ -2123,7 +2123,6 @@ NineDevice9_LightEnable( struct NineDevice9 *This, BOOL Enable ) { struct nine_state *state = This->update; - unsigned i; DBG("This=%p Index=%u Enable=%i\n", This, Index, Enable); @@ -2139,30 +2138,8 @@ NineDevice9_LightEnable( struct NineDevice9 *This, light.Direction.z = 1.0f; NineDevice9_SetLight(This, Index, &light); } - user_assert(Index < state->ff.num_lights, D3DERR_INVALIDCALL); - - for (i = 0; i < state->ff.num_lights_active; ++i) { - if (state->ff.active_light[i] == Index) - break; - } - if (Enable) { - if (i < state->ff.num_lights_active) - return D3D_OK; - /* XXX wine thinks this should still succeed: - */ - user_assert(i < NINE_MAX_LIGHTS_ACTIVE, D3DERR_INVALIDCALL); - - state->ff.active_light[i] = Index; - state->ff.num_lights_active++; - } else { - if (i == state->ff.num_lights_active) - return D3D_OK; - --state->ff.num_lights_active; - for (; i < state->ff.num_lights_active; ++i) - state->ff.active_light[i] = state->ff.active_light[i + 1]; - } - state->changed.group |= NINE_STATE_FF_LIGHTING; + nine_state_light_enable(&state->ff, &state->changed.group, Index, Enable); return D3D_OK; } |