Module: Mesa Branch: master Commit: 8118d3719aee5fdf313c33dbf3256dd78ff46bea URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8118d3719aee5fdf313c33dbf3256dd78ff46bea
Author: Marek Olšák <[email protected]> Date: Mon Aug 3 21:43:36 2015 +0200 radeonsi: rename enable_s3tc -> enable_compressed_formats Reviewed-by: Alex Deucher <[email protected]> --- src/gallium/drivers/radeonsi/si_state.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index 867dbc6..a7aa062 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -1173,7 +1173,7 @@ static uint32_t si_translate_texformat(struct pipe_screen *screen, int first_non_void) { struct si_screen *sscreen = (struct si_screen*)screen; - bool enable_s3tc = sscreen->b.info.drm_minor >= 31; + bool enable_compressed_formats = sscreen->b.info.drm_minor >= 31; boolean uniform = TRUE; int i; @@ -1216,7 +1216,7 @@ static uint32_t si_translate_texformat(struct pipe_screen *screen, } if (desc->layout == UTIL_FORMAT_LAYOUT_RGTC) { - if (!enable_s3tc) + if (!enable_compressed_formats) goto out_unknown; switch (format) { @@ -1236,7 +1236,7 @@ static uint32_t si_translate_texformat(struct pipe_screen *screen, } if (desc->layout == UTIL_FORMAT_LAYOUT_BPTC) { - if (!enable_s3tc) + if (!enable_compressed_formats) goto out_unknown; switch (format) { @@ -1265,8 +1265,7 @@ static uint32_t si_translate_texformat(struct pipe_screen *screen, } if (desc->layout == UTIL_FORMAT_LAYOUT_S3TC) { - - if (!enable_s3tc) + if (!enable_compressed_formats) goto out_unknown; if (!util_format_s3tc_enabled) { _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
