diff options
author | Axel Davy <[email protected]> | 2015-05-11 21:32:57 +0200 |
---|---|---|
committer | Axel Davy <[email protected]> | 2015-08-21 22:21:47 +0200 |
commit | 69de5d626f2e67e74e4de94ce13f7ac50fa52161 (patch) | |
tree | 40f314701d177f3a1b0705d8f7ce94dfc8b2aa65 /src/gallium/state_trackers/nine/nine_state.h | |
parent | 854778ea0fea474eea0c984f1c0fc32aed91f10e (diff) |
st/nine: Rework shader states
Separate state setting and commit
Changes how the shader key is computed
Signed-off-by: Axel Davy <[email protected]>
Diffstat (limited to 'src/gallium/state_trackers/nine/nine_state.h')
-rw-r--r-- | src/gallium/state_trackers/nine/nine_state.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/state_trackers/nine/nine_state.h b/src/gallium/state_trackers/nine/nine_state.h index b3a2babbd4f..efaee1ee95e 100644 --- a/src/gallium/state_trackers/nine/nine_state.h +++ b/src/gallium/state_trackers/nine/nine_state.h @@ -83,6 +83,8 @@ #define NINE_STATE_COMMIT_BLEND (1 << 2) #define NINE_STATE_COMMIT_CONST_VS (1 << 3) #define NINE_STATE_COMMIT_CONST_PS (1 << 4) +#define NINE_STATE_COMMIT_VS (1 << 5) +#define NINE_STATE_COMMIT_PS (1 << 6) #define NINE_MAX_SIMULTANEOUS_RENDERTARGETS 4 @@ -148,7 +150,6 @@ struct nine_state int vs_const_i[NINE_MAX_CONST_I][4]; BOOL vs_const_b[NINE_MAX_CONST_B]; float *vs_lconstf_temp; - uint32_t vs_key; struct NinePixelShader9 *ps; float *ps_const_f; @@ -156,7 +157,6 @@ struct nine_state BOOL ps_const_b[NINE_MAX_CONST_B]; float *ps_lconstf_temp; uint32_t bumpmap_vars[48]; - uint32_t ps_key; struct { void *vs; |