For the series:
Reviewed-by: Marek Olšák <marek.ol...@amd.com>
Marek
On Mon, Sep 11, 2017 at 5:06 PM, Nicolai Hähnle <nhaeh...@gmail.com> wrote:
> From: Nicolai Hähnle <nicolai.haeh...@amd.com>
>
> ---
> src/gallium/drivers/radeonsi/si_state.c | 20 ++++++++++----------
> 1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/src/gallium/drivers/radeonsi/si_state.c
> b/src/gallium/drivers/radeonsi/si_state.c
> index ee070107fd5..da3c7debd57 100644
> --- a/src/gallium/drivers/radeonsi/si_state.c
> +++ b/src/gallium/drivers/radeonsi/si_state.c
> @@ -2168,50 +2168,50 @@ static void si_choose_spi_color_formats(struct
> r600_surface *surf,
> surf->spi_shader_col_format_blend_alpha = blend_alpha;
> }
>
> static void si_initialize_color_surface(struct si_context *sctx,
> struct r600_surface *surf)
> {
> struct r600_texture *rtex = (struct r600_texture*)surf->base.texture;
> unsigned color_info, color_attrib, color_view;
> unsigned format, swap, ntype, endian;
> const struct util_format_description *desc;
> - int i;
> + int firstchan;
> unsigned blend_clamp = 0, blend_bypass = 0;
>
> color_view = S_028C6C_SLICE_START(surf->base.u.tex.first_layer) |
> S_028C6C_SLICE_MAX(surf->base.u.tex.last_layer);
>
> desc = util_format_description(surf->base.format);
> - for (i = 0; i < 4; i++) {
> - if (desc->channel[i].type != UTIL_FORMAT_TYPE_VOID) {
> + for (firstchan = 0; firstchan < 4; firstchan++) {
> + if (desc->channel[firstchan].type != UTIL_FORMAT_TYPE_VOID) {
> break;
> }
> }
> - if (i == 4 || desc->channel[i].type == UTIL_FORMAT_TYPE_FLOAT) {
> + if (firstchan == 4 || desc->channel[firstchan].type ==
> UTIL_FORMAT_TYPE_FLOAT) {
> ntype = V_028C70_NUMBER_FLOAT;
> } else {
> ntype = V_028C70_NUMBER_UNORM;
> if (desc->colorspace == UTIL_FORMAT_COLORSPACE_SRGB)
> ntype = V_028C70_NUMBER_SRGB;
> - else if (desc->channel[i].type == UTIL_FORMAT_TYPE_SIGNED) {
> - if (desc->channel[i].pure_integer) {
> + else if (desc->channel[firstchan].type ==
> UTIL_FORMAT_TYPE_SIGNED) {
> + if (desc->channel[firstchan].pure_integer) {
> ntype = V_028C70_NUMBER_SINT;
> } else {
> - assert(desc->channel[i].normalized);
> + assert(desc->channel[firstchan].normalized);
> ntype = V_028C70_NUMBER_SNORM;
> }
> - } else if (desc->channel[i].type ==
> UTIL_FORMAT_TYPE_UNSIGNED) {
> - if (desc->channel[i].pure_integer) {
> + } else if (desc->channel[firstchan].type ==
> UTIL_FORMAT_TYPE_UNSIGNED) {
> + if (desc->channel[firstchan].pure_integer) {
> ntype = V_028C70_NUMBER_UINT;
> } else {
> - assert(desc->channel[i].normalized);
> + assert(desc->channel[firstchan].normalized);
> ntype = V_028C70_NUMBER_UNORM;
> }
> }
> }
>
> format = si_translate_colorformat(surf->base.format);
> if (format == V_028C70_COLOR_INVALID) {
> R600_ERR("Invalid CB format: %d, disabling CB.\n",
> surf->base.format);
> }
> assert(format != V_028C70_COLOR_INVALID);
> --
> 2.11.0
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
