From: Elizabeth Figura zfigura@codeweavers.com
The comment was originally added in 4b831a5d3e15af9dccf7114bb4440133cb8fe721. At that point, it referred only to non-FFP shader constants. Subsequently 38934fe70d7ffd2353351a7986346f4a205adc1f moved bumpenv constant loading to the misc pipeline, apparently out of concerns that bumpenv constants might interact badly with shader constants.
It's not clear whether those concerns were ever justified, and normal shader constants are now sufficiently untangled from each other anyway. However, bumpenv constants, like e.g. color keys, affect both FFP and non-FFP pipelines, so it makes the most sense for them to remain in the misc state table anyway. --- dlls/wined3d/state.c | 4 ---- 1 file changed, 4 deletions(-)
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 5333382ab81..1dcef265b95 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4379,10 +4379,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_POINTSPRITECOORDORIGIN, { STATE_POINTSPRITECOORDORIGIN, state_nop }, ARB_CLIP_CONTROL }, { STATE_POINTSPRITECOORDORIGIN, { STATE_POINTSPRITECOORDORIGIN, psorigin }, WINED3D_GL_VERSION_2_0 }, { STATE_POINTSPRITECOORDORIGIN, { STATE_POINTSPRITECOORDORIGIN, psorigin_w }, WINED3D_GL_EXT_NONE }, - - /* TODO: Move shader constant loading to vertex and fragment pipeline respectively, as soon as the pshader and - * vshader loadings are untied from each other - */ { STATE_TEXTURESTAGE(0, WINED3D_TSS_BUMPENV_MAT00), { STATE_TEXTURESTAGE(0, WINED3D_TSS_BUMPENV_MAT00), shader_bumpenv }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(0, WINED3D_TSS_BUMPENV_MAT01), { STATE_TEXTURESTAGE(0, WINED3D_TSS_BUMPENV_MAT00), NULL }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(0, WINED3D_TSS_BUMPENV_MAT10), { STATE_TEXTURESTAGE(0, WINED3D_TSS_BUMPENV_MAT00), NULL }, WINED3D_GL_EXT_NONE },