Mesa (main): lavapipe: remove initialization override

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 8795501cef6e583a26f73fd24bd077a74f5e65cf
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8795501cef6e583a26f73fd24bd077a74f5e65cf

Author: Thomas H.P. Andersen <phomes at gmail.com>
Date:   Mon Jul  5 00:27:24 2021 +0200

lavapipe: remove initialization override

These are duplicates from a few lines up

Reviewed-by: Dave Airlie <airlied at redhat.com>
Reviewed-by: Roland Scheidegger <sroland at vmware.com>
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11703>

---

 src/gallium/frontends/lavapipe/lvp_device.c   | 1 -
 src/gallium/frontends/lavapipe/lvp_formats.c  | 1 -
 src/gallium/frontends/lavapipe/lvp_pipeline.c | 1 -
 3 files changed, 3 deletions(-)

diff --git a/src/gallium/frontends/lavapipe/lvp_device.c b/src/gallium/frontends/lavapipe/lvp_device.c
index 7e60d116851..f036c3c1d6f 100644
--- a/src/gallium/frontends/lavapipe/lvp_device.c
+++ b/src/gallium/frontends/lavapipe/lvp_device.c
@@ -429,7 +429,6 @@ VKAPI_ATTR void VKAPI_CALL lvp_GetPhysicalDeviceFeatures(
       .shaderFloat64                            = (pdevice->pscreen->get_param(pdevice->pscreen, PIPE_CAP_DOUBLES) == 1),
       .shaderInt64                              = (pdevice->pscreen->get_param(pdevice->pscreen, PIPE_CAP_INT64) == 1),
       .shaderInt16                              = (min_shader_param(pdevice->pscreen, PIPE_SHADER_CAP_INT16) == 1),
-      .alphaToOne                               = true,
       .variableMultisampleRate                  = false,
       .inheritedQueries                         = false,
    };
diff --git a/src/gallium/frontends/lavapipe/lvp_formats.c b/src/gallium/frontends/lavapipe/lvp_formats.c
index eff571e0c44..10bca26ee35 100644
--- a/src/gallium/frontends/lavapipe/lvp_formats.c
+++ b/src/gallium/frontends/lavapipe/lvp_formats.c
@@ -47,7 +47,6 @@ static enum pipe_format format_to_vk_table[VK_FORMAT_ASTC_12x12_SRGB_BLOCK + 1]
    COMMON_NAME(R8G8B8A8_SRGB),
 
    COMMON_NAME(B8G8R8A8_UNORM),
-   COMMON_NAME(R8G8B8A8_SRGB),
    COMMON_NAME(B8G8R8A8_SRGB),
 
    COMMON_NAME(R8_UINT),
diff --git a/src/gallium/frontends/lavapipe/lvp_pipeline.c b/src/gallium/frontends/lavapipe/lvp_pipeline.c
index 63b8041f43f..75a54b878d1 100644
--- a/src/gallium/frontends/lavapipe/lvp_pipeline.c
+++ b/src/gallium/frontends/lavapipe/lvp_pipeline.c
@@ -490,7 +490,6 @@ lvp_shader_compile_to_ir(struct lvp_pipeline *pipeline,
          .stencil_export = true,
          .post_depth_coverage = true,
          .transform_feedback = true,
-         .geometry_streams = true,
          .device_group = true,
          .draw_parameters = true,
          .shader_viewport_index_layer = true,