diff options
| -rw-r--r-- | src/gallium/state_trackers/nine/device9.c | 2 | ||||
| -rw-r--r-- | src/gallium/state_trackers/nine/nine_state.c | 16 | ||||
| -rw-r--r-- | src/gallium/state_trackers/nine/nine_state.h | 13 |
3 files changed, 14 insertions, 17 deletions
diff --git a/src/gallium/state_trackers/nine/device9.c b/src/gallium/state_trackers/nine/device9.c index 04f90ad8210..37fcba875ff 100644 --- a/src/gallium/state_trackers/nine/device9.c +++ b/src/gallium/state_trackers/nine/device9.c @@ -2538,7 +2538,7 @@ NineDevice9_SetTextureStageState( struct NineDevice9 *This, if (unlikely(This->is_recording)) { if (Type == D3DTSS_TEXTURETRANSFORMFLAGS) - state->changed.group |= NINE_STATE_PS1X_SHADER; + state->changed.group |= NINE_STATE_PS_PARAMS_MISC; state->changed.group |= NINE_STATE_FF_PSSTAGES; state->ff.changed.tex_stage[Stage][Type / 32] |= 1 << (Type % 32); } else diff --git a/src/gallium/state_trackers/nine/nine_state.c b/src/gallium/state_trackers/nine/nine_state.c index c81a05a952b..3ab90633d25 100644 --- a/src/gallium/state_trackers/nine/nine_state.c +++ b/src/gallium/state_trackers/nine/nine_state.c @@ -1077,15 +1077,13 @@ commit_ps(struct NineDevice9 *device) #define NINE_STATE_SHADER_CHANGE_VS \ (NINE_STATE_VS | \ NINE_STATE_TEXTURE | \ - NINE_STATE_FOG_SHADER | \ - NINE_STATE_POINTSIZE_SHADER | \ + NINE_STATE_VS_PARAMS_MISC | \ NINE_STATE_SWVP) #define NINE_STATE_SHADER_CHANGE_PS \ (NINE_STATE_PS | \ NINE_STATE_TEXTURE | \ - NINE_STATE_FOG_SHADER | \ - NINE_STATE_PS1X_SHADER) + NINE_STATE_PS_PARAMS_MISC) #define NINE_STATE_FREQUENT \ (NINE_STATE_RASTERIZER | \ @@ -1861,7 +1859,7 @@ CSMT_ITEM_NO_WAIT(nine_context_set_texture_stage_state, bumpmap_index = 4 * 8 + 2 * Stage + 1; break; case D3DTSS_TEXTURETRANSFORMFLAGS: - context->changed.group |= NINE_STATE_PS1X_SHADER; + context->changed.group |= NINE_STATE_PS_PARAMS_MISC; break; default: break; @@ -3531,10 +3529,10 @@ const uint32_t nine_render_state_group[NINED3DRS_LAST + 1] = [D3DRS_ALPHAFUNC] = NINE_STATE_DSA, [D3DRS_DITHERENABLE] = NINE_STATE_BLEND, [D3DRS_ALPHABLENDENABLE] = NINE_STATE_BLEND, - [D3DRS_FOGENABLE] = NINE_STATE_FF_OTHER | NINE_STATE_FOG_SHADER | NINE_STATE_PS_CONST, + [D3DRS_FOGENABLE] = NINE_STATE_FF_OTHER | NINE_STATE_VS_PARAMS_MISC | NINE_STATE_PS_PARAMS_MISC | NINE_STATE_PS_CONST, [D3DRS_SPECULARENABLE] = NINE_STATE_FF_LIGHTING, [D3DRS_FOGCOLOR] = NINE_STATE_FF_OTHER | NINE_STATE_PS_CONST, - [D3DRS_FOGTABLEMODE] = NINE_STATE_FF_OTHER | NINE_STATE_FOG_SHADER | NINE_STATE_PS_CONST, + [D3DRS_FOGTABLEMODE] = NINE_STATE_FF_OTHER | NINE_STATE_PS_PARAMS_MISC | NINE_STATE_PS_CONST, [D3DRS_FOGSTART] = NINE_STATE_FF_OTHER | NINE_STATE_PS_CONST, [D3DRS_FOGEND] = NINE_STATE_FF_OTHER | NINE_STATE_PS_CONST, [D3DRS_FOGDENSITY] = NINE_STATE_FF_OTHER | NINE_STATE_PS_CONST, @@ -3570,7 +3568,7 @@ const uint32_t nine_render_state_group[NINED3DRS_LAST + 1] = [D3DRS_VERTEXBLEND] = NINE_STATE_FF_OTHER, [D3DRS_CLIPPLANEENABLE] = NINE_STATE_RASTERIZER, [D3DRS_POINTSIZE] = NINE_STATE_RASTERIZER, - [D3DRS_POINTSIZE_MIN] = NINE_STATE_RASTERIZER | NINE_STATE_POINTSIZE_SHADER, + [D3DRS_POINTSIZE_MIN] = NINE_STATE_RASTERIZER | NINE_STATE_VS_PARAMS_MISC, [D3DRS_POINTSPRITEENABLE] = NINE_STATE_RASTERIZER, [D3DRS_POINTSCALEENABLE] = NINE_STATE_FF_OTHER, [D3DRS_POINTSCALE_A] = NINE_STATE_FF_OTHER, @@ -3580,7 +3578,7 @@ const uint32_t nine_render_state_group[NINED3DRS_LAST + 1] = [D3DRS_MULTISAMPLEMASK] = NINE_STATE_SAMPLE_MASK, [D3DRS_PATCHEDGESTYLE] = NINE_STATE_UNHANDLED, [D3DRS_DEBUGMONITORTOKEN] = NINE_STATE_UNHANDLED, - [D3DRS_POINTSIZE_MAX] = NINE_STATE_RASTERIZER | NINE_STATE_POINTSIZE_SHADER, + [D3DRS_POINTSIZE_MAX] = NINE_STATE_RASTERIZER | NINE_STATE_VS_PARAMS_MISC, [D3DRS_INDEXEDVERTEXBLENDENABLE] = NINE_STATE_FF_OTHER, [D3DRS_COLORWRITEENABLE] = NINE_STATE_BLEND, [D3DRS_TWEENFACTOR] = NINE_STATE_FF_OTHER, diff --git a/src/gallium/state_trackers/nine/nine_state.h b/src/gallium/state_trackers/nine/nine_state.h index f5fd1ef9cd8..b8a74a4ee2f 100644 --- a/src/gallium/state_trackers/nine/nine_state.h +++ b/src/gallium/state_trackers/nine/nine_state.h @@ -83,13 +83,12 @@ #define NINE_STATE_FF_VSTRANSF (1 << 22) #define NINE_STATE_FF_PSSTAGES (1 << 23) #define NINE_STATE_FF_OTHER (1 << 24) -#define NINE_STATE_FOG_SHADER (1 << 25) -#define NINE_STATE_PS1X_SHADER (1 << 26) -#define NINE_STATE_POINTSIZE_SHADER (1 << 27) -#define NINE_STATE_MULTISAMPLE (1 << 28) -#define NINE_STATE_SWVP (1 << 29) -#define NINE_STATE_ALL 0x3fffffff -#define NINE_STATE_UNHANDLED (1 << 30) +#define NINE_STATE_VS_PARAMS_MISC (1 << 25) +#define NINE_STATE_PS_PARAMS_MISC (1 << 26) +#define NINE_STATE_MULTISAMPLE (1 << 27) +#define NINE_STATE_SWVP (1 << 28) +#define NINE_STATE_ALL 0x1fffffff +#define NINE_STATE_UNHANDLED (1 << 29) #define NINE_STATE_COMMIT_DSA (1 << 0) #define NINE_STATE_COMMIT_RASTERIZER (1 << 1) |