diff options
| author | Marek Olšák <[email protected]> | 2017-11-15 22:02:51 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2018-02-13 01:00:45 +0100 |
| commit | 07c10cc59c164ddd0109e061dac8edf47437d8ca (patch) | |
| tree | ad38e5e0408a4fe07fb41a77b0bacef2e19a7100 /src/mesa/program | |
| parent | 79aca14f5f37de32140fb710970133c72886a0f2 (diff) | |
mesa: separate legacy stuff from gl_texture_unit into gl_fixedfunc_texture_unit
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa/program')
| -rw-r--r-- | src/mesa/program/prog_statevars.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/mesa/program/prog_statevars.c b/src/mesa/program/prog_statevars.c index 481123a7dc2..78f70053017 100644 --- a/src/mesa/program/prog_statevars.c +++ b/src/mesa/program/prog_statevars.c @@ -215,28 +215,28 @@ _mesa_fetch_state(struct gl_context *ctx, const gl_state_index state[], /* state[2] is the texgen attribute */ switch (state[2]) { case STATE_TEXGEN_EYE_S: - COPY_4V(value, ctx->Texture.Unit[unit].GenS.EyePlane); + COPY_4V(value, ctx->Texture.FixedFuncUnit[unit].GenS.EyePlane); return; case STATE_TEXGEN_EYE_T: - COPY_4V(value, ctx->Texture.Unit[unit].GenT.EyePlane); + COPY_4V(value, ctx->Texture.FixedFuncUnit[unit].GenT.EyePlane); return; case STATE_TEXGEN_EYE_R: - COPY_4V(value, ctx->Texture.Unit[unit].GenR.EyePlane); + COPY_4V(value, ctx->Texture.FixedFuncUnit[unit].GenR.EyePlane); return; case STATE_TEXGEN_EYE_Q: - COPY_4V(value, ctx->Texture.Unit[unit].GenQ.EyePlane); + COPY_4V(value, ctx->Texture.FixedFuncUnit[unit].GenQ.EyePlane); return; case STATE_TEXGEN_OBJECT_S: - COPY_4V(value, ctx->Texture.Unit[unit].GenS.ObjectPlane); + COPY_4V(value, ctx->Texture.FixedFuncUnit[unit].GenS.ObjectPlane); return; case STATE_TEXGEN_OBJECT_T: - COPY_4V(value, ctx->Texture.Unit[unit].GenT.ObjectPlane); + COPY_4V(value, ctx->Texture.FixedFuncUnit[unit].GenT.ObjectPlane); return; case STATE_TEXGEN_OBJECT_R: - COPY_4V(value, ctx->Texture.Unit[unit].GenR.ObjectPlane); + COPY_4V(value, ctx->Texture.FixedFuncUnit[unit].GenR.ObjectPlane); return; case STATE_TEXGEN_OBJECT_Q: - COPY_4V(value, ctx->Texture.Unit[unit].GenQ.ObjectPlane); + COPY_4V(value, ctx->Texture.FixedFuncUnit[unit].GenQ.ObjectPlane); return; default: _mesa_problem(ctx, "Invalid texgen state in fetch_state"); @@ -248,9 +248,9 @@ _mesa_fetch_state(struct gl_context *ctx, const gl_state_index state[], /* state[1] is the texture unit */ const GLuint unit = (GLuint) state[1]; if (_mesa_get_clamp_fragment_color(ctx, ctx->DrawBuffer)) - COPY_4V(value, ctx->Texture.Unit[unit].EnvColor); + COPY_4V(value, ctx->Texture.FixedFuncUnit[unit].EnvColor); else - COPY_4V(value, ctx->Texture.Unit[unit].EnvColorUnclamped); + COPY_4V(value, ctx->Texture.FixedFuncUnit[unit].EnvColorUnclamped); } return; case STATE_FOG_COLOR: |