radv: fix adjusting vertex alpha
authorSamuel Pitoiset <samuel.pitoiset@gmail.com>
Mon, 12 Oct 2020 17:14:32 +0000 (19:14 +0200)
committerSamuel Pitoiset <samuel.pitoiset@gmail.com>
Mon, 12 Oct 2020 17:48:35 +0000 (19:48 +0200)
AC_FETCH_FORMAT_NONE is not zero... Oops.

Fixes: b0829c6af70 ("radv: replace RADV_ALPHA_ADJUST by AC_FETCH_FORMAT")
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7103>

src/amd/vulkan/radv_pipeline.c

index ab1d756..27cb9f3 100644 (file)
@@ -2444,10 +2444,10 @@ radv_generate_graphics_pipeline_key(struct radv_pipeline *pipeline,
                key.vertex_attribute_offsets[location] = desc->offset;
                key.vertex_attribute_strides[location] = radv_get_attrib_stride(input_state, desc->binding);
 
+               enum ac_fetch_format adjust = AC_FETCH_FORMAT_NONE;
                if (pipeline->device->physical_device->rad_info.chip_class <= GFX8 &&
                    pipeline->device->physical_device->rad_info.family != CHIP_STONEY) {
                        VkFormat format = input_state->pVertexAttributeDescriptions[i].format;
-                       uint64_t adjust;
                        switch(format) {
                        case VK_FORMAT_A2R10G10B10_SNORM_PACK32:
                        case VK_FORMAT_A2B10G10R10_SNORM_PACK32:
@@ -2462,11 +2462,10 @@ radv_generate_graphics_pipeline_key(struct radv_pipeline *pipeline,
                                adjust = AC_FETCH_FORMAT_SINT;
                                break;
                        default:
-                               adjust = AC_FETCH_FORMAT_NONE;
                                break;
                        }
-                       key.vertex_alpha_adjust[location] = adjust;
                }
+               key.vertex_alpha_adjust[location] = adjust;
 
                switch (desc->format) {
                case VK_FORMAT_B8G8R8A8_UNORM: