aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAxel Davy <[email protected]>2018-10-13 22:28:34 +0200
committerAxel Davy <[email protected]>2018-10-26 22:16:16 +0200
commit2e51c4c7cc43232cf13659f7fface771cd49037e (patch)
tree09ecbb11ffd07d24fc97fbd2cf58b57427a7cdee /src
parentcb8ea21e1c0de86131b11e88c72407baf6621567 (diff)
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 <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/gallium/state_trackers/nine/device9.c2
-rw-r--r--src/gallium/state_trackers/nine/nine_state.h2
2 files changed, 1 insertions, 3 deletions
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)