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

fix release builds not compiling, use correct function to check if asset pack exists

Browse Source
This commit is contained in:
matthew 2025-07-12 19:21:59 +10:00
parent 56cadf09df
commit b89d01984c
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/gears/vulkan.d
View File

@ -289,7 +289,7 @@ BeginRender(Vulkan* vk)
sType: VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_INFO, sType: VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_INFO,
imageView: vk.draw_image.view, imageView: vk.draw_image.view,
imageLayout: vk.draw_image.base.layout, imageLayout: vk.draw_image.base.layout,
loadOp: VK_ATTACHMENT_LOAD_OP_LOAD, loadOp: VK_ATTACHMENT_LOAD_OP_LOAD, // CLEAR instead of LOAD if wanting to clear colors, also clearColor value (or whatever)
storeOp: VK_ATTACHMENT_STORE_OP_STORE, storeOp: VK_ATTACHMENT_STORE_OP_STORE,
}; };
@ -896,7 +896,7 @@ InitDescriptors(Vulkan* vk)
if (success) if (success)
{ {
foreach(i; cast(u64)DT.min .. cast(u64)DT.max) foreach(i; cast(u64)DT.min .. cast(u64)DT.max)
{ {
vk.desc_bindings[i].lookup_table = u.CreateHashTable!(string, u32)(8); vk.desc_bindings[i].lookup_table = u.CreateHashTable!(string, u32)(8);
@ -1710,10 +1710,13 @@ Destroy(VkInstance instance)
void void
Destroy(VkDebugUtilsMessengerEXT dbg, VkInstance instance) Destroy(VkDebugUtilsMessengerEXT dbg, VkInstance instance)
{ {
if (dbg) debug
{ {
vkDestroyDebugUtilsMessengerEXT(instance, dbg, null); if (dbg)
} {
vkDestroyDebugUtilsMessengerEXT(instance, dbg, null);
}
}
} }
void void
@ -1951,10 +1954,10 @@ EnableVLayers(Vulkan* vk)
VkDebugUtilsMessengerCreateInfoEXT info = { VkDebugUtilsMessengerCreateInfoEXT info = {
sType: VK_STRUCTURE_TYPE_DEBUG_UTILS_MESSENGER_CREATE_INFO_EXT, sType: VK_STRUCTURE_TYPE_DEBUG_UTILS_MESSENGER_CREATE_INFO_EXT,
messageSeverity: VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT | messageSeverity: VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT |
VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT, VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT,
messageType: VK_DEBUG_UTILS_MESSAGE_TYPE_GENERAL_BIT_EXT | messageType: VK_DEBUG_UTILS_MESSAGE_TYPE_GENERAL_BIT_EXT |
VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT | VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT |
VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT, VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT,
pfnUserCallback: cast(PFN_vkDebugUtilsMessengerCallbackEXT)&DebugCallback, pfnUserCallback: cast(PFN_vkDebugUtilsMessengerCallbackEXT)&DebugCallback,
}; };

3
src/shared/assets.d
View File

@ -69,7 +69,7 @@ OpenAssetPack()
if (!Asset_Pack_Opened) if (!Asset_Pack_Opened)
{ {
bool success = true; bool success = true;
string file_path = isFile("build/assets.sgp") ? "build/assets.sgp" : "assets.sgp"; string file_path = exists("build/assets.sgp") ? "build/assets.sgp" : "assets.sgp";
// TODO: replace this with something that doesn't throw an exception and figure out if this is the best way to handle thing (probably isnt) // TODO: replace this with something that doesn't throw an exception and figure out if this is the best way to handle thing (probably isnt)
try try
@ -78,6 +78,7 @@ OpenAssetPack()
} }
catch (ErrnoException e) catch (ErrnoException e)
{ {
Logf("OpenAssetPack failure: Unable to open file %s", file_path); Logf("OpenAssetPack failure: Unable to open file %s", file_path);
assert(false, "Unable to open asset pack file"); assert(false, "Unable to open asset pack file");
} }