Mesa (master): lavapipe: enable EXT_scalar_block_layout

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: db0a71c9ae5a9510ff84146d30518a9e11bf1020
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=db0a71c9ae5a9510ff84146d30518a9e11bf1020

Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Mar 15 08:01:50 2021 +1000

lavapipe: enable EXT_scalar_block_layout

The frontend should handle this.

Acked-By: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9590>

---

 docs/features.txt                           | 2 +-
 src/gallium/frontends/lavapipe/lvp_device.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/docs/features.txt b/docs/features.txt
index e77c232a611..de421cbd5ec 100644
--- a/docs/features.txt
+++ b/docs/features.txt
@@ -468,7 +468,7 @@ Vulkan 1.2 -- all DONE: anv
   VK_EXT_descriptor_indexing                            DONE (anv/gen9+, radv)
   VK_EXT_host_query_reset                               DONE (anv, radv, tu)
   VK_EXT_sampler_filter_minmax                          DONE (anv/gen9+, lvp, radv, tu)
-  VK_EXT_scalar_block_layout                            DONE (anv, radv/gfx7+)
+  VK_EXT_scalar_block_layout                            DONE (anv, lvp, radv/gfx7+)
   VK_EXT_separate_stencil_usage                         DONE (anv)
   VK_EXT_shader_viewport_index_layer                    DONE (anv, lvp, radv, tu)
 
diff --git a/src/gallium/frontends/lavapipe/lvp_device.c b/src/gallium/frontends/lavapipe/lvp_device.c
index f7bce513d27..6af4204bac0 100644
--- a/src/gallium/frontends/lavapipe/lvp_device.c
+++ b/src/gallium/frontends/lavapipe/lvp_device.c
@@ -124,6 +124,7 @@ static const struct vk_device_extension_table lvp_device_extensions_supported =
    .EXT_post_depth_coverage               = true,
    .EXT_private_data                      = true,
    .EXT_sampler_filter_minmax             = true,
+   .EXT_scalar_block_layout               = true,
    .EXT_shader_stencil_export             = true,
    .EXT_shader_viewport_index_layer       = true,
    .EXT_transform_feedback                = true,
@@ -511,6 +512,11 @@ VKAPI_ATTR void VKAPI_CALL lvp_GetPhysicalDeviceFeatures2(
          features->uniformBufferStandardLayout = true;
          break;
       }
+      case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCALAR_BLOCK_LAYOUT_FEATURES_EXT: {
+         VkPhysicalDeviceScalarBlockLayoutFeaturesEXT *features =
+            (VkPhysicalDeviceScalarBlockLayoutFeaturesEXT *)ext;
+         features->scalarBlockLayout = true;
+      }
       default:
          break;
       }