sleepy-day/VulkanRenderer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replace debug conditions with debug flag, fix script

Browse Source
This commit is contained in:
Matthew 2025-09-29 07:48:57 +10:00
parent 33054121f2
commit c000b2d630
3 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sh
View File

@ -34,7 +34,7 @@ fi
# Convert Shader # Convert Shader
shader="${script_dir}/convert.comp.glsl" shader="${script_dir}/convert.comp.glsl"
shader_compiler="glslc" shader_compiler="glslc"
shader_flags="--target-spv=spv1.4 -std=460 -O --target-env=vulkan1.2" shader_flags="-std=460 -O --target-env=vulkan1.2"
shader_out="-o${build}/" shader_out="-o${build}/"
shader_stage="-fshader-stage=comp" shader_stage="-fshader-stage=comp"

21
vulkan.d
View File

@ -8,7 +8,7 @@ import core.stdc.stdio : Printf = printf;
import std.format : sformat; import std.format : sformat;
import std.math.rounding : Ceil = ceil; import std.math.rounding : Ceil = ceil;
debug version(VULKAN_DEBUG)
{ {
const BUILD_DEBUG = true; const BUILD_DEBUG = true;
} }
@ -104,10 +104,7 @@ const char*[] VK_AMD_DEVICE_EXTENSIONS = [
version(AMD_GPU) version(AMD_GPU)
{ {
debug version(VULKAN_DEBUG) const char*[] VK_DEVICE_EXTENSIONS = VK_AMD_DEVICE_EXTENSIONS ~ VK_BASE_DEVICE_EXTENSIONS;
{
const char*[] VK_DEVICE_EXTENSIONS = VK_AMD_DEVICE_EXTENSIONS ~ VK_BASE_DEVICE_EXTENSIONS;
}
} }
else else
{ {
@ -3122,14 +3119,11 @@ Destroy(VkInstance instance)
void void
Destroy(VkDebugUtilsMessengerEXT dbg, VkInstance instance) Destroy(VkDebugUtilsMessengerEXT dbg, VkInstance instance)
{ {
debug version(VULKAN_DEBUG) if(dbg)
{
if(dbg)
{ {
vkDestroyDebugUtilsMessengerEXT(instance, dbg, null); vkDestroyDebugUtilsMessengerEXT(instance, dbg, null);
} }
} }
}
void void
Destroy(VkSurfaceKHR surface, VkInstance instance) Destroy(VkSurfaceKHR surface, VkInstance instance)
@ -3332,13 +3326,10 @@ InitInstance(Vulkan* vk)
pEnabledValidationFeatures: &validation_enable, pEnabledValidationFeatures: &validation_enable,
}; };
debug version(VULKAN_DEBUG) if(g_VLAYER_SUPPORT && g_DEBUG_PRINTF)
{
if(g_VLAYER_SUPPORT && g_DEBUG_PRINTF)
{ {
instance_info.pNext = &validation_features; instance_info.pNext = &validation_features;
} }
}
VkResult result = vkCreateInstance(&instance_info, null, &vk.instance); VkResult result = vkCreateInstance(&instance_info, null, &vk.instance);
success = VkCheck("vkCreateInstance failure", result); success = VkCheck("vkCreateInstance failure", result);
@ -3381,7 +3372,7 @@ version(Windows)
void void
EnableVLayers(Vulkan* vk) EnableVLayers(Vulkan* vk)
{ {
debug version (VULKAN_DEBUG)
{ {
Push(vk, SI.Debug); Push(vk, SI.Debug);
@ -3428,7 +3419,7 @@ PrintShaderDisassembly(Vulkan* vk, Pipeline pipeline_id, VkShaderStageFlagBits s
{ {
PipelineHandles* pipeline = vk.pipeline_handles.ptr + pipeline_id; PipelineHandles* pipeline = vk.pipeline_handles.ptr + pipeline_id;
debug version(VULKAN_DEBUG)
{ {
u64 size; u64 size;
VkResult result = vkGetShaderInfoAMD(vk.device, pipeline.handle, stage, VK_SHADER_INFO_TYPE_DISASSEMBLY_AMD, &size, null); VkResult result = vkGetShaderInfoAMD(vk.device, pipeline.handle, stage, VK_SHADER_INFO_TYPE_DISASSEMBLY_AMD, &size, null);

8
vulkan_funcs.d
View File

@ -25,7 +25,7 @@ PFN_vkGetDeviceProcAddr vkGetDeviceProcAddr = null;
PFN_vkDestroyInstance vkDestroyInstance = null; PFN_vkDestroyInstance vkDestroyInstance = null;
PFN_vkDestroySurfaceKHR vkDestroySurfaceKHR = null; PFN_vkDestroySurfaceKHR vkDestroySurfaceKHR = null;
debug version(VULKAN_DEBUG)
{ {
PFN_vkCreateDebugUtilsMessengerEXT vkCreateDebugUtilsMessengerEXT = null; PFN_vkCreateDebugUtilsMessengerEXT vkCreateDebugUtilsMessengerEXT = null;
PFN_vkDestroyDebugUtilsMessengerEXT vkDestroyDebugUtilsMessengerEXT = null; PFN_vkDestroyDebugUtilsMessengerEXT vkDestroyDebugUtilsMessengerEXT = null;
@ -46,7 +46,7 @@ version(Windows)
version(AMD_GPU) version(AMD_GPU)
{ {
debug version(VULKAN_DEBUG)
{ {
PFN_vkGetShaderInfoAMD vkGetShaderInfoAMD = null; PFN_vkGetShaderInfoAMD vkGetShaderInfoAMD = null;
} }
@ -230,7 +230,7 @@ LoadDeviceFunctions(Vulkan* vk)
version(AMD_GPU) version(AMD_GPU)
{ {
debug version(VULKAN_DEBUG)
{ {
vkGetShaderInfoAMD = cast(PFN_vkGetShaderInfoAMD)vkGetDeviceProcAddr(vk.device, "vkGetShaderInfoAMD"); vkGetShaderInfoAMD = cast(PFN_vkGetShaderInfoAMD)vkGetDeviceProcAddr(vk.device, "vkGetShaderInfoAMD");
assert(vkGetShaderInfoAMD != null, "vkGetShaderInfoAMD pointer is null"); assert(vkGetShaderInfoAMD != null, "vkGetShaderInfoAMD pointer is null");
@ -268,7 +268,7 @@ version(Windows)
vkCreateWin32SurfaceKHR = cast(PFN_vkCreateWin32SurfaceKHR)vkGetInstanceProcAddr(vk.instance, "vkCreateWin32SurfaceKHR"); vkCreateWin32SurfaceKHR = cast(PFN_vkCreateWin32SurfaceKHR)vkGetInstanceProcAddr(vk.instance, "vkCreateWin32SurfaceKHR");
} }
debug version(VULKAN_DEBUG)
{ {
vkCreateDebugUtilsMessengerEXT = cast(PFN_vkCreateDebugUtilsMessengerEXT)vkGetInstanceProcAddr(vk.instance, "vkCreateDebugUtilsMessengerEXT"); vkCreateDebugUtilsMessengerEXT = cast(PFN_vkCreateDebugUtilsMessengerEXT)vkGetInstanceProcAddr(vk.instance, "vkCreateDebugUtilsMessengerEXT");
vkDestroyDebugUtilsMessengerEXT = cast(PFN_vkDestroyDebugUtilsMessengerEXT)vkGetInstanceProcAddr(vk.instance, "vkDestroyDebugUtilsMessengerEXT"); vkDestroyDebugUtilsMessengerEXT = cast(PFN_vkDestroyDebugUtilsMessengerEXT)vkGetInstanceProcAddr(vk.instance, "vkDestroyDebugUtilsMessengerEXT");