diff options
| author | Brian Paul <brianp@vmware.com> | 2011-09-17 14:50:48 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2011-09-17 14:57:40 -0600 |
| commit | baeefef2c0445bfd717a3086fdd9b5bd5d9cb675 (patch) | |
| tree | 65c6a77f82a9e8b9eb5b58818bea7e226d1f12bc /src/mesa/swrast/s_texrender.c | |
| parent | ce82914f5ad4bb9148370826099925590e9798fd (diff) | |
| download | external_mesa3d-baeefef2c0445bfd717a3086fdd9b5bd5d9cb675.zip external_mesa3d-baeefef2c0445bfd717a3086fdd9b5bd5d9cb675.tar.gz external_mesa3d-baeefef2c0445bfd717a3086fdd9b5bd5d9cb675.tar.bz2 | |
mesa: move software texel fetch code into swrast
It's only used by swrast now so move it out of core Mesa.
Diffstat (limited to 'src/mesa/swrast/s_texrender.c')
| -rw-r--r-- | src/mesa/swrast/s_texrender.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/mesa/swrast/s_texrender.c b/src/mesa/swrast/s_texrender.c index 52d03c9..b32b9e1 100644 --- a/src/mesa/swrast/s_texrender.c +++ b/src/mesa/swrast/s_texrender.c @@ -3,10 +3,10 @@ #include "main/colormac.h" #include "main/fbobject.h" #include "main/macros.h" -#include "main/texfetch.h" #include "main/teximage.h" #include "main/renderbuffer.h" #include "swrast/swrast.h" +#include "swrast/s_texfetch.h" /* @@ -543,7 +543,11 @@ update_wrapper(struct gl_context *ctx, struct gl_renderbuffer_attachment *att) trb->Store = store_nop; } + if (!trb->TexImage->FetchTexelf) { + _mesa_update_fetch_functions(trb->TexImage->TexObject); + } trb->Fetchf = trb->TexImage->FetchTexelf; + assert(trb->Fetchf); if (att->Texture->Target == GL_TEXTURE_1D_ARRAY_EXT) { trb->Yoffset = att->Zoffset; |