summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/texcompress.c
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2012-08-22 21:23:53 -0600
committerBrian Paul <[email protected]>2012-08-24 06:18:42 -0600
commit4fec5e9154582439bc185eb143e89f220b169c32 (patch)
tree777bae62306b6571ab29d8dcab0d0f70d443be97 /src/mesa/main/texcompress.c
parentd78b44c2651b45c337dda71b17351beb41eb9c14 (diff)
mesa/swrast: fix GL_TEXTURE_2D_ARRAY texture fetches for dxt formats
As with the previous commit. This fixes the last crash in the piglit copyteximage test but there's still some failures.
Diffstat (limited to 'src/mesa/main/texcompress.c')
-rw-r--r--src/mesa/main/texcompress.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/main/texcompress.c b/src/mesa/main/texcompress.c
index 5e669375963..846d4bb639a 100644
--- a/src/mesa/main/texcompress.c
+++ b/src/mesa/main/texcompress.c
@@ -494,16 +494,16 @@ _mesa_decompress_image(gl_format format, GLuint width, GLuint height,
switch (format) {
/* DXT formats */
case MESA_FORMAT_RGB_DXT1:
- fetch = _mesa_fetch_texel_2d_f_rgb_dxt1;
+ fetch = _mesa_fetch_texel_rgb_dxt1;
break;
case MESA_FORMAT_RGBA_DXT1:
- fetch = _mesa_fetch_texel_2d_f_rgba_dxt1;
+ fetch = _mesa_fetch_texel_rgba_dxt1;
break;
case MESA_FORMAT_RGBA_DXT3:
- fetch = _mesa_fetch_texel_2d_f_rgba_dxt3;
+ fetch = _mesa_fetch_texel_rgba_dxt3;
break;
case MESA_FORMAT_RGBA_DXT5:
- fetch = _mesa_fetch_texel_2d_f_rgba_dxt5;
+ fetch = _mesa_fetch_texel_rgba_dxt5;
break;
/* FXT1 formats */