add debug marker extension to device

diff --git a/shaders/vkvg_main_lcd.frag b/shaders/vkvg_main_lcd.frag
index 6b24b4a34976ca9e2d217aa3abff59413d139e73..9a282036e3b739ca520c09dec9e982d3a008271d 100644 (file)
--- a/shaders/vkvg_main_lcd.frag
+++ b/shaders/vkvg_main_lcd.frag
@@ -34,8 +34,8 @@ layout (set=2, binding = 0) uniform _uboGrad {
 }uboGrad;
 
 layout (location = 0) in vec3  inFontUV;               //if it is a text drawing, inFontUV.z hold fontMap layer
-layout (location = 1) in vec4  inSrc;                  //source bounds or color
-layout (location = 2) in flat int inPatType;
+layout (location = 1) in vec4  inSrc;                  //source bounds or color depending on pattern type
+layout (location = 2) in flat int inPatType;   //pattern type
 layout (location = 3) in mat3x2 inMat;
 
 layout (location = 0) out vec4 outFragColor;
@@ -63,7 +63,6 @@ void main()
                        inMat[0][0] * p.x + inMat[1][0] * p.y + inMat[2][0],
                        inMat[0][1] * p.x + inMat[1][1] * p.y + inMat[2][1]
                );
-
                c = texture (source, uv / inSrc.zw);
                break;
        case LINEAR:
@@ -81,6 +80,8 @@ void main()
                for ( int i=1; i<uboGrad.count-1; ++i )
                        c = mix(c, uboGrad.colors[i+1], smoothstep( gradientStartPosRotatedX + uboGrad.stops[i].r*d, gradientStartPosRotatedX + uboGrad.stops[i+1].r*d, xLocRotated ) );
                break;
+       case RADIAL:
+               break;
        }
 
        if (inFontUV.z >= 0.0)

diff --git a/src/vkvg_pattern.c b/src/vkvg_pattern.c
index 7fd6231b7fa63081bcc24b8f4b8c90bead7b7a84..0f4ebd3f7838f6ac7886e48e365920ecdde96f76 100644 (file)
--- a/src/vkvg_pattern.c
+++ b/src/vkvg_pattern.c
@@ -92,6 +92,8 @@ VkvgPattern vkvg_pattern_create_linear (float x0, float y0, float x1, float y1){
 VkvgPattern vkvg_pattern_create_radial (float cx0, float cy0, float radius0,
                                         float cx1, float cy1, float radius1){
     VkvgPattern pat = (vkvg_pattern_t*)calloc(1, sizeof(vkvg_pattern_t));
+    pat->type = VKVG_PATTERN_TYPE_RADIAL;
+    pat->extend = VKVG_EXTEND_PAD;
 
     vkvg_gradient_t* grad = (vkvg_gradient_t*)calloc(1,sizeof(vkvg_gradient_t));
 

diff --git a/tests/common/vkengine.c b/tests/common/vkengine.c
index 2be2a72ce71565ae62541e4b27f7570c436b4646..787b3dfca8350b9f3d4cc0bb0950f1c7a3adae91 100644 (file)
--- a/tests/common/vkengine.c
+++ b/tests/common/vkengine.c
@@ -163,7 +163,15 @@ vk_engine_t* vkengine_create (VkPhysicalDeviceType preferedGPU, VkPresentModeKHR
         }
     }
 
+#if DEBUG
+    char const * dex [] = {"VK_KHR_swapchain", "VK_EXT_debug_marker"};
+    enabledExtsCount = 2;
+#else
     char const * dex [] = {"VK_KHR_swapchain"};
+    enabledExtsCount = 1;
+#endif
+
+
 
     VkPhysicalDeviceFeatures enabledFeatures = {
         .fillModeNonSolid = true,
@@ -173,7 +181,7 @@ vk_engine_t* vkengine_create (VkPhysicalDeviceType preferedGPU, VkPresentModeKHR
     VkDeviceCreateInfo device_info = { .sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO,
                                        .queueCreateInfoCount = qCount,
                                        .pQueueCreateInfos = (VkDeviceQueueCreateInfo*)&pQueueInfos,
-                                       .enabledExtensionCount = 1,
+                                       .enabledExtensionCount = enabledExtsCount,
                                        .ppEnabledExtensionNames = dex,
                                        .pEnabledFeatures = &enabledFeatures
                                      };
@@ -184,6 +192,8 @@ vk_engine_t* vkengine_create (VkPhysicalDeviceType preferedGPU, VkPresentModeKHR
 
 #if DEBUG
     dbgReport = vkh_device_create_debug_report (e->dev,
+
+    //VK_DEBUG_REPORT_INFORMATION_BIT_EXT|
             VK_DEBUG_REPORT_ERROR_BIT_EXT|
             VK_DEBUG_REPORT_WARNING_BIT_EXT|
             VK_DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT|

diff --git a/vkh b/vkh
index 18388a6b066cb569dedd4df1125974d0d208a503..38f463fd3eda82350ed019f17ead06e6057b16d1 160000 (submodule)
--- a/vkh
+++ b/vkh
@@ -1 +1 @@
-Subproject commit 18388a6b066cb569dedd4df1125974d0d208a503
+Subproject commit 38f463fd3eda82350ed019f17ead06e6057b16d1