Mesa (master): st/nine: Remove two unused states.

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 2e51c4c7cc43232cf13659f7fface771cd49037e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2e51c4c7cc43232cf13659f7fface771cd49037e

Author: Axel Davy <davyaxel0 at gmail.com>
Date:   Sat Oct 13 22:28:34 2018 +0200

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 <davyaxel0 at gmail.com>

---

 src/gallium/state_trackers/nine/device9.c    | 2 +-
 src/gallium/state_trackers/nine/nine_state.h | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/gallium/state_trackers/nine/device9.c b/src/gallium/state_trackers/nine/device9.c
index 51e49ac430..3b174587a4 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 a3cc66ef8b..7c4517b3fe 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)