diff options
| author | Timothy Arceri <[email protected]> | 2016-10-19 13:23:37 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2016-10-26 14:29:36 +1100 |
| commit | 3423488d55b9c483fcdb3996eb89b424c1031d24 (patch) | |
| tree | 270d90fe3fd4c090f2c8e59a3b20d0afe7d98e72 /src/mesa/main/texstate.c | |
| parent | 17e28a1571b6141368fefc84cc8b0a3b4e52f8ee (diff) | |
st/mesa/r200/i915/i965: eliminate gl_fragment_program
Here we move OriginUpperLeft and PixelCenterInteger into gl_program
all other fields have been replace by shader_info.
V2: Don't use anonymous union/structs to hold vertex/fragment fields
suggested by Ian.
Reviewed-by: Jason Ekstrand <[email protected]>
Diffstat (limited to 'src/mesa/main/texstate.c')
| -rw-r--r-- | src/mesa/main/texstate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c index 94caf2a9ca8..95ea5bd58ee 100644 --- a/src/mesa/main/texstate.c +++ b/src/mesa/main/texstate.c @@ -705,7 +705,7 @@ update_texture_state( struct gl_context *ctx ) prog[i] = ctx->_Shader->CurrentProgram[i]->_LinkedShaders[i]->Program; } else { if (i == MESA_SHADER_FRAGMENT && ctx->FragmentProgram._Enabled) - prog[i] = &ctx->FragmentProgram.Current->Base; + prog[i] = ctx->FragmentProgram.Current; else prog[i] = NULL; } |