From: Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
Date: Thu, 13 Jan 2022 14:04:14 +0000 (+0100)
Subject: scalar block layout enabled in vk device creation info
X-Git-Tag: v0.3.0-beta~11
X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=9a7f3d47620fd7b2f305eb6e52505513365d55fd;p=jp%2Fvkvg.git

scalar block layout enabled in vk device creation info
---

diff --git a/shaders/vkvg_main.frag b/shaders/vkvg_main.frag
index 0d60365..d40e796 100644
--- 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 70408b1..a0f99af 100644
--- 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 a442c1f..3da9972 100644
--- 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);