From: Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
Date: Thu, 4 Jul 2019 20:13:07 +0000 (+0200)
Subject: add debug marker extension to device
X-Git-Tag: v0.1-alpha~70
X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=40c5bb51121430c166f71cc1c240cf7e1eaed07b;p=jp%2Fvkvg.git

add debug marker extension to device
---

diff --git a/shaders/vkvg_main_lcd.frag b/shaders/vkvg_main_lcd.frag
index 6b24b4a..9a28203 100644
--- 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 7fd6231..0f4ebd3 100644
--- 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 2be2a72..787b3df 100644
--- 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 18388a6..38f463f 160000
--- a/vkh
+++ b/vkh
@@ -1 +1 @@
-Subproject commit 18388a6b066cb569dedd4df1125974d0d208a503
+Subproject commit 38f463fd3eda82350ed019f17ead06e6057b16d1