diff options
| author | Pauli Nieminen <[email protected]> | 2012-06-12 21:38:56 +0300 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2012-08-01 15:55:51 -0700 |
| commit | cbdc1d53542b3ecca0085399c4bb3b3371f94809 (patch) | |
| tree | c835fd6c56f22692f8db127a882ae94e7a70d498 /src/mesa/swrast/s_texfetch.h | |
| parent | 8129dabb5f5ff717bb1ca32710ca6204d5345461 (diff) | |
swrast: Support sampler object for texture fetching state
swrast needs to pass sampler object into all texture fetching functions
to use correct sampling state when sampler object is bound to the unit.
The changes were made using half manual regular expression replace.
v2: Fix NULL deref in _swrast_choose_triangle(), because the _Current
values aren't set yet, so we need to look at our texObj2D. (anholt)
Signed-off-by: Pauli Nieminen <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa/swrast/s_texfetch.h')
| -rw-r--r-- | src/mesa/swrast/s_texfetch.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/swrast/s_texfetch.h b/src/mesa/swrast/s_texfetch.h index 1aa7ce573e2..33950ce440c 100644 --- a/src/mesa/swrast/s_texfetch.h +++ b/src/mesa/swrast/s_texfetch.h @@ -33,6 +33,6 @@ extern FetchTexelFunc _mesa_get_texel_fetch_func(gl_format format, GLuint dims); void -_mesa_update_fetch_functions(struct gl_texture_object *texObj); +_mesa_update_fetch_functions(struct gl_context *ctx, GLuint unit); #endif /* S_TEXFETCH_H */ |