virgl: rename msaa_sample_positions -> sample_locations

This matches what this field is called in virglrenderer's copy of
this.

This reduces the diff between the two different versions of
virgl_hw.h, and should make it easier to upgrade the file in
the future.

Signed-off-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Acked-by: Dave Airlie <airlied@redhat.com>

diff --git a/src/gallium/drivers/virgl/virgl_context.c b/src/gallium/drivers/virgl/virgl_context.c
index d1a1c98660e2ead059975894b167c4a2e1eddf46..03c0fd7cd500c8f6db3e3fcaafcc6ccb7423ab0d 100644 (file)
--- a/src/gallium/drivers/virgl/virgl_context.c
+++ b/src/gallium/drivers/virgl/virgl_context.c
@@ -1100,13 +1100,13 @@ static void virgl_get_sample_position(struct pipe_context *ctx,
       out_value[0] = out_value[1] = 0.5f;
       return;
    } else if (sample_count == 2) {
-      bits = vs->caps.caps.v2.msaa_sample_positions[0] >> (8 * index);
+      bits = vs->caps.caps.v2.sample_locations[0] >> (8 * index);
    } else if (sample_count <= 4) {
-      bits = vs->caps.caps.v2.msaa_sample_positions[1] >> (8 * index);
+      bits = vs->caps.caps.v2.sample_locations[1] >> (8 * index);
    } else if (sample_count <= 8) {
-      bits = vs->caps.caps.v2.msaa_sample_positions[2 + (index >> 2)] >> (8 * (index & 3));
+      bits = vs->caps.caps.v2.sample_locations[2 + (index >> 2)] >> (8 * (index & 3));
    } else if (sample_count <= 16) {
-      bits = vs->caps.caps.v2.msaa_sample_positions[4 + (index >> 2)] >> (8 * (index & 3));
+      bits = vs->caps.caps.v2.sample_locations[4 + (index >> 2)] >> (8 * (index & 3));
    }
    out_value[0] = ((bits >> 4) & 0xf) / 16.0f;
    out_value[1] = (bits & 0xf) / 16.0f;

diff --git a/src/gallium/drivers/virgl/virgl_hw.h b/src/gallium/drivers/virgl/virgl_hw.h
index 02cedcd0dc0dd19cbe7d5fd8d9861354125c37c8..7f1373a7241d804f35ddfc91e6930ae42c0b7b25 100644 (file)
--- a/src/gallium/drivers/virgl/virgl_hw.h
+++ b/src/gallium/drivers/virgl/virgl_hw.h
@@ -309,7 +309,7 @@ struct virgl_caps_v2 {
         uint32_t uniform_buffer_offset_alignment;
         uint32_t shader_buffer_offset_alignment;
         uint32_t capability_bits;
-        uint32_t msaa_sample_positions[8];
+        uint32_t sample_locations[8];
         uint32_t max_vertex_attrib_stride;
         uint32_t max_shader_buffer_frag_compute;
         uint32_t max_shader_buffer_other_stages;