radv: drop unused code related to 16 sample locations
authorSamuel Pitoiset <samuel.pitoiset@gmail.com>
Thu, 17 Jan 2019 17:11:07 +0000 (18:11 +0100)
committerSamuel Pitoiset <samuel.pitoiset@gmail.com>
Fri, 18 Jan 2019 12:26:24 +0000 (13:26 +0100)
The driver only supports up to 8 sample locations.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
src/amd/vulkan/radv_device.c
src/amd/vulkan/radv_meta_resolve.c
src/amd/vulkan/radv_nir_to_llvm.c

index 6cadbe722ae85b7fe87b61efbd49955b908a0b74..b2112a6ed347fdc5ae3ae831f1c14c04ff65a455 100644 (file)
@@ -2093,8 +2093,6 @@ fill_geom_tess_rings(struct radv_queue *queue,
        memcpy(desc, queue->device->sample_locations_4x, 32);
        desc += 8;
        memcpy(desc, queue->device->sample_locations_8x, 64);
-       desc += 16;
-       memcpy(desc, queue->device->sample_locations_16x, 128);
 }
 
 static unsigned
index 7ce36b1df6e9701e5c31af000c0adb8376e2cffa..6a7cbfe84688bd1616a7b0368dbfd9d29fb7fd93 100644 (file)
@@ -456,14 +456,6 @@ void radv_CmdResolveImage(
        }
        assert(dest_image->info.samples == 1);
 
-       if (src_image->info.samples >= 16) {
-               /* See commit aa3f9aaf31e9056a255f9e0472ebdfdaa60abe54 for the
-                * glBlitFramebuffer workaround for samples >= 16.
-                */
-               radv_finishme("vkCmdResolveImage: need interpolation workaround when "
-                             "samples >= 16");
-       }
-
        if (src_image->info.array_size > 1)
                radv_finishme("vkCmdResolveImage: multisample array images");
 
index 9d0aa411528e626d5656d99f8e95d6533264362b..40812fa7ffb2336591873f9847dfe3e8b9c19e97 100644 (file)
@@ -1690,9 +1690,6 @@ radv_get_sample_pos_offset(uint32_t num_samples)
        case 8:
                sample_pos_offset = 7;
                break;
-       case 16:
-               sample_pos_offset = 15;
-               break;
        default:
                break;
        }