diff options
| author | Brian Paul <[email protected]> | 2012-08-22 21:22:00 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2012-08-24 06:18:41 -0600 |
| commit | d78b44c2651b45c337dda71b17351beb41eb9c14 (patch) | |
| tree | 646da5be94f7026494ec1c589acfe178cefaa1cd /src/mesa/main/texcompress.c | |
| parent | fe2cc65fbb37bca40ff215a3709dacbcd317350c (diff) | |
mesa/swrast: fix GL_TEXTURE_2D_ARRAY texture fetches for latc/rgtc formats
Fix-up the texel fetch functions so that they handle 3D coords (as used for
array textures) and remove the "f_2d" part from their names.
Helps fix swrast crashes in piglit's copyteximage test. More to come.
Diffstat (limited to 'src/mesa/main/texcompress.c')
| -rw-r--r-- | src/mesa/main/texcompress.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mesa/main/texcompress.c b/src/mesa/main/texcompress.c index 48c472eda63..5e669375963 100644 --- a/src/mesa/main/texcompress.c +++ b/src/mesa/main/texcompress.c @@ -516,30 +516,30 @@ _mesa_decompress_image(gl_format format, GLuint width, GLuint height, /* Red/RG formats */ case MESA_FORMAT_RED_RGTC1: - fetch = _mesa_fetch_texel_2d_f_red_rgtc1; + fetch = _mesa_fetch_texel_red_rgtc1; break; case MESA_FORMAT_SIGNED_RED_RGTC1: - fetch = _mesa_fetch_texel_2d_f_signed_red_rgtc1; + fetch = _mesa_fetch_texel_signed_red_rgtc1; break; case MESA_FORMAT_RG_RGTC2: - fetch = _mesa_fetch_texel_2d_f_rg_rgtc2; + fetch = _mesa_fetch_texel_rg_rgtc2; break; case MESA_FORMAT_SIGNED_RG_RGTC2: - fetch = _mesa_fetch_texel_2d_f_signed_rg_rgtc2; + fetch = _mesa_fetch_texel_signed_rg_rgtc2; break; /* L/LA formats */ case MESA_FORMAT_L_LATC1: - fetch = _mesa_fetch_texel_2d_f_l_latc1; + fetch = _mesa_fetch_texel_l_latc1; break; case MESA_FORMAT_SIGNED_L_LATC1: - fetch = _mesa_fetch_texel_2d_f_signed_l_latc1; + fetch = _mesa_fetch_texel_signed_l_latc1; break; case MESA_FORMAT_LA_LATC2: - fetch = _mesa_fetch_texel_2d_f_la_latc2; + fetch = _mesa_fetch_texel_la_latc2; break; case MESA_FORMAT_SIGNED_LA_LATC2: - fetch = _mesa_fetch_texel_2d_f_signed_la_latc2; + fetch = _mesa_fetch_texel_signed_la_latc2; break; /* ETC1 formats */ |