scalar block layout enabled in vk device creation info

diff --git a/shaders/vkvg_main.frag b/shaders/vkvg_main.frag
index 0d60365e9cf38adfd388a90d7ff138d23093570b..d40e796516952a229f7fc19e28dc9887cfd36c44 100644 (file)
--- a/shaders/vkvg_main.frag
+++ b/shaders/vkvg_main.frag
@@ -27,7 +27,7 @@
 
 layout (set=0, binding = 0) uniform sampler2DArray fontMap;
 layout (set=1, binding = 0) uniform sampler2D          source;
-layout (std430, set=2, binding = 0) uniform _uboGrad {
+layout (scalar, set=2, binding = 0) uniform _uboGrad {
        vec4    colors[16];
        float   stops[16];
        vec4    cp[2];

diff --git a/shaders/wired.frag b/shaders/wired.frag
index 70408b185ba72feffcf91d510119047575764fa4..a0f99af8dcfc62079d56b841d24a22c5c78e7447 100644 (file)
--- a/shaders/wired.frag
+++ b/shaders/wired.frag
@@ -6,7 +6,7 @@
 
 layout (set=0, binding = 0) uniform sampler2DArray fontMap;
 layout (set=1, binding = 0) uniform sampler2D          source;
-layout (std430, set=2, binding = 0) uniform _uboGrad {
+layout (scalar, set=2, binding = 0) uniform _uboGrad {
        vec4    colors[16];
        float   stops[16];
        vec4    cp[2];

diff --git a/tests/common/vkengine.c b/tests/common/vkengine.c
index a442c1f404779778b09aedabc37e5c2e757d15e2..3da99729add6166eeb8e096cec006182501f66f6 100644 (file)
--- a/tests/common/vkengine.c
+++ b/tests/common/vkengine.c
@@ -207,13 +207,18 @@ vk_engine_t* vkengine_create (VkPhysicalDeviceType preferedGPU, VkPresentModeKHR
                .fillModeNonSolid = true,
                //.sampleRateShading = true
        };
+       VkPhysicalDeviceVulkan12Features enabledFeatures12 = {
+               .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_FEATURES,
+               .scalarBlockLayout = true
+       };
 
        VkDeviceCreateInfo device_info = { .sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO,
                                                                           .queueCreateInfoCount = qCount,
                                                                           .pQueueCreateInfos = (VkDeviceQueueCreateInfo*)&pQueueInfos,
                                                                           .enabledExtensionCount = enabledExtsCount,
                                                                           .ppEnabledExtensionNames = enabledExts,
-                                                                          .pEnabledFeatures = &enabledFeatures};
+                                                                          .pEnabledFeatures = &enabledFeatures,
+                                                                          .pNext = &enabledFeatures12};
 
        e->dev = vkh_device_create(e->app, pi, &device_info);