diff options
| author | Brian Paul <brianp@vmware.com> | 2009-11-02 18:42:25 +0100 |
|---|---|---|
| committer | Luc Verhaegen <libv@skynet.be> | 2009-11-18 09:52:32 +0100 |
| commit | 0604812bd80f35ff3fb7d30b69ab6f0a842aa1a7 (patch) | |
| tree | 52fa5c417cc8660c08249541f924d0237a9211b3 | |
| parent | 8d131debeeb9f31445c1230ecf1477e61007857e (diff) | |
DRI: via: use mesa texture format helper functions
Original SHA-ID: b58bc12ed4a3de6c828bd26c4820d7ddbb1eabd6
| -rw-r--r-- | dri/via_tex.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/dri/via_tex.c b/dri/via_tex.c index 388fd93..02a0043 100644 --- a/dri/via_tex.c +++ b/dri/via_tex.c @@ -30,6 +30,7 @@ #include "main/macros.h" #include "main/mtypes.h" #include "main/enums.h" +#include "main/formats.h" #include "main/colortab.h" #include "main/convolve.h" #include "main/context.h" @@ -689,15 +690,9 @@ static void viaTexImage(GLcontext *ctx, assert(texImage->TexFormat); - if (dims == 1) { - texImage->FetchTexelc = texImage->TexFormat->FetchTexel1D; - texImage->FetchTexelf = texImage->TexFormat->FetchTexel1Df; - } - else { - texImage->FetchTexelc = texImage->TexFormat->FetchTexel2D; - texImage->FetchTexelf = texImage->TexFormat->FetchTexel2Df; - } - texelBytes = texImage->TexFormat->TexelBytes; + _mesa_set_fetch_functions(texImage, dims); + + texelBytes = _mesa_get_format_bytes(texImage->TexFormat->MesaFormat); if (texelBytes == 0) { /* compressed format */ @@ -804,7 +799,7 @@ static void viaTexImage(GLcontext *ctx, dstRowStride = _mesa_compressed_row_stride(texImage->TexFormat->MesaFormat, width); } else { - dstRowStride = postConvWidth * texImage->TexFormat->TexelBytes; + dstRowStride = postConvWidth * _mesa_get_format_bytes(texImage->TexFormat->MesaFormat); } ASSERT(storeImage); success = storeImage(ctx, dims, |