From: Axel Davy Date: Sat, 13 Oct 2018 20:28:34 +0000 (+0200) Subject: st/nine: Remove two unused states. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2e51c4c7cc43232cf13659f7fface771cd49037e;p=mesa.git st/nine: Remove two unused states. NINE_STATE_MATERIAL was used incorrectly at one location. Replace it with the correct state. Signed-off-by: Axel Davy --- diff --git a/src/gallium/state_trackers/nine/device9.c b/src/gallium/state_trackers/nine/device9.c index 51e49ac4303..3b174587a44 100644 --- a/src/gallium/state_trackers/nine/device9.c +++ b/src/gallium/state_trackers/nine/device9.c @@ -2374,7 +2374,7 @@ NineDevice9_CreateStateBlock( struct NineDevice9 *This, NINE_STATE_BLEND | NINE_STATE_DSA | NINE_STATE_IDXBUF | - NINE_STATE_MATERIAL | + NINE_STATE_FF_MATERIAL | NINE_STATE_BLEND_COLOR | NINE_STATE_SAMPLE_MASK; memset(dst->changed.rs, ~0, (D3DRS_COUNT / 32) * sizeof(uint32_t)); diff --git a/src/gallium/state_trackers/nine/nine_state.h b/src/gallium/state_trackers/nine/nine_state.h index a3cc66ef8b5..7c4517b3fef 100644 --- a/src/gallium/state_trackers/nine/nine_state.h +++ b/src/gallium/state_trackers/nine/nine_state.h @@ -70,8 +70,6 @@ #define NINE_STATE_VDECL (1 << 12) #define NINE_STATE_IDXBUF (1 << 13) #define NINE_STATE_STREAMFREQ (1 << 14) -#define NINE_STATE_PRIM (1 << 15) -#define NINE_STATE_MATERIAL (1 << 16) #define NINE_STATE_BLEND_COLOR (1 << 17) #define NINE_STATE_STENCIL_REF (1 << 18) #define NINE_STATE_SAMPLE_MASK (1 << 19)