diff options
| author | Brian Paul <[email protected]> | 2011-09-17 14:50:48 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2011-09-17 14:57:40 -0600 |
| commit | ce82914f5ad4bb9148370826099925590e9798fd (patch) | |
| tree | 5d5e0c19f5d09c52df3aaa88a95c13a4ff89b7dd /src/mesa/main | |
| parent | f0f28548c29690fc9e44a2f7b0d1965d9fc564fa (diff) | |
mesa: move _mesa_update_fetch_functions() calls into swrast
Do it during swrast state validation since the FetchTexel() functions
are only called from swrast now and not core Mesa.
Remove assertions in mipmap.c since they're no longer appropriate.
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/mipmap.c | 4 | ||||
| -rw-r--r-- | src/mesa/main/teximage.c | 7 | ||||
| -rw-r--r-- | src/mesa/main/texparam.c | 1 |
3 files changed, 1 insertions, 11 deletions
diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c index 869243d1c76..6dfa423f123 100644 --- a/src/mesa/main/mipmap.c +++ b/src/mesa/main/mipmap.c @@ -1955,8 +1955,6 @@ generate_mipmap_uncompressed(struct gl_context *ctx, GLenum target, dstDepth, border, srcImage->InternalFormat, srcImage->TexFormat); dstImage->DriverData = NULL; - dstImage->FetchTexelc = srcImage->FetchTexelc; - dstImage->FetchTexelf = srcImage->FetchTexelf; /* Alloc new teximage data buffer */ { @@ -1970,8 +1968,6 @@ generate_mipmap_uncompressed(struct gl_context *ctx, GLenum target, } ASSERT(dstImage->TexFormat); - ASSERT(dstImage->FetchTexelc); - ASSERT(dstImage->FetchTexelf); _mesa_generate_mipmap_level(target, datatype, comps, border, srcWidth, srcHeight, srcDepth, diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index cb4a5b4e437..e11acc41281 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -42,7 +42,6 @@ #include "mfeatures.h" #include "state.h" #include "texcompress.h" -#include "texfetch.h" #include "teximage.h" #include "texstate.h" #include "texpal.h" @@ -1104,7 +1103,7 @@ _mesa_init_teximage_fields(struct gl_context *ctx, GLenum target, GLint border, GLenum internalFormat, gl_format format) { - GLint i, dims; + GLint i; ASSERT(img); ASSERT(width >= 0); @@ -1176,10 +1175,6 @@ _mesa_init_teximage_fields(struct gl_context *ctx, GLenum target, } img->TexFormat = format; - - dims = _mesa_get_texture_dimensions(target); - - _mesa_set_fetch_functions(img, dims); } diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c index 19a01a14deb..f7f00490aa5 100644 --- a/src/mesa/main/texparam.c +++ b/src/mesa/main/texparam.c @@ -432,7 +432,6 @@ set_tex_parameteri(struct gl_context *ctx, if (texObj->Sampler.sRGBDecode != decode) { flush(ctx); texObj->Sampler.sRGBDecode = decode; - _mesa_update_fetch_functions(texObj); } return GL_TRUE; } |