pyrite-dev/milsko
pyrite-dev/milsko
12
1
Fork 3
Code Issues 4 Pull requests Projects Releases 10 Packages Wiki Activity Actions

fix vulkan's usage of removed error primative
Some checks failed
pyrite-dev/milsko/pipeline/head There was a failure building this commit
Details

Browse source
This commit is contained in:
IoI_xD 2026-03-31 13:28:05 -07:00
commit b6b8f742d7
3 changed files with 25 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

29
examples/vkdemos/vulkan.c
View file

@ -231,43 +231,16 @@ void vulkan_setup(MwWidget handle) {
VkSemaphoreCreateInfo semaphoreInfo = {}; VkSemaphoreCreateInfo semaphoreInfo = {};
VkFenceCreateInfo fenceInfo = {}; VkFenceCreateInfo fenceInfo = {};
MwErrorEnum err = MwEsuccess; int err = 0;
_vkGetInstanceProcAddr = MwVulkanGetField(handle, MwVulkanField_GetInstanceProcAddr, &err); _vkGetInstanceProcAddr = MwVulkanGetField(handle, MwVulkanField_GetInstanceProcAddr, &err);
if(err != MwEsuccess) {
printf("Error getting vkGetInstanceProcAddr!\n%s\n", MwGetLastError());
}
instance = MwVulkanGetField(handle, MwVulkanField_Instance, &err); instance = MwVulkanGetField(handle, MwVulkanField_Instance, &err);
if(err != MwEsuccess) {
printf("Error getting vulkan instance!\n%s\n", MwGetLastError());
}
device = MwVulkanGetField(handle, MwVulkanField_LogicalDevice, &err); device = MwVulkanGetField(handle, MwVulkanField_LogicalDevice, &err);
if(err != MwEsuccess) {
printf("Error getting VkDevice!\n%s\n", MwGetLastError());
}
physicalDevice = MwVulkanGetField(handle, MwVulkanField_PhysicalDevice, &err); physicalDevice = MwVulkanGetField(handle, MwVulkanField_PhysicalDevice, &err);
if(err != MwEsuccess) {
printf("Error getting physical device!\n%s\n", MwGetLastError());
}
graphicsQueue = MwVulkanGetField(handle, MwVulkanField_GraphicsQueue, &err); graphicsQueue = MwVulkanGetField(handle, MwVulkanField_GraphicsQueue, &err);
if(err != MwEsuccess) {
printf("Error getting graphics queue!\n%s\n", MwGetLastError());
}
presentQueue = MwVulkanGetField(handle, MwVulkanField_PresentQueue, &err); presentQueue = MwVulkanGetField(handle, MwVulkanField_PresentQueue, &err);
if(err != MwEsuccess) {
printf("Error getting present queue!\n%s\n", MwGetLastError());
}
surface = MwVulkanGetField(handle, MwVulkanField_Surface, &err); surface = MwVulkanGetField(handle, MwVulkanField_Surface, &err);
if(err != MwEsuccess) {
printf("Error getting surface!\n%s\n", MwGetLastError());
}
presentQueueIndex = MwVulkanGetField(handle, MwVulkanField_PresentQueueIndex, &err); presentQueueIndex = MwVulkanGetField(handle, MwVulkanField_PresentQueueIndex, &err);
if(err != MwEsuccess) {
printf("Error getting present queue index!\n%s\n", MwGetLastError());
}
graphicsQueueIndex = MwVulkanGetField(handle, MwVulkanField_GraphicsQueueIndex, &err); graphicsQueueIndex = MwVulkanGetField(handle, MwVulkanField_GraphicsQueueIndex, &err);
if(err != MwEsuccess) {
printf("Error getting graphics queue index!\n%s\n", MwGetLastError());
}
LOAD_VK_FUNCTION(vkCreateShaderModule); LOAD_VK_FUNCTION(vkCreateShaderModule);
LOAD_VK_FUNCTION(vkCreatePipelineLayout); LOAD_VK_FUNCTION(vkCreatePipelineLayout);

2
include/Mw/Widget/Vulkan.h
View file

@ -111,7 +111,7 @@ typedef enum MwVulkanField_T {
* @brief Function for getting a field from within Vulkan. * @brief Function for getting a field from within Vulkan.
* @warning Consult the documentation for MwVulkanField to know what type is expected for out. * @warning Consult the documentation for MwVulkanField to know what type is expected for out.
*/ */
MwInline void* MwVulkanGetField(MwWidget handle, MwVulkanField field, MwErrorEnum* out) { MwInline void* MwVulkanGetField(MwWidget handle, MwVulkanField field, int* out) {
void* field_out; void* field_out;
MwVaWidgetExecute(handle, "mwVulkanGetField", &field_out, field, out); MwVaWidgetExecute(handle, "mwVulkanGetField", &field_out, field, out);
return field_out; return field_out;

34
src/widget/vulkan.c
View file

@ -48,7 +48,7 @@ MwVulkanConfig vulkan_config = {
vk_res = func; \ vk_res = func; \
if(vk_res != VK_SUCCESS) { \ if(vk_res != VK_SUCCESS) { \
char buf[1024]; \ char buf[1024]; \
MwPrintIntoBuffer(buf, 1024, "Vulkan error (%s:%d): %s\n", __FILE__, __LINE__, string_VkResult(vk_res)); \ MwStringPrintIntoBuffer(buf, 1024, "Vulkan error (%s:%d): %s\n", __FILE__, __LINE__, string_VkResult(vk_res)); \
MwDispatchError(1, buf); \ MwDispatchError(1, buf); \
return 1; \ return 1; \
} }
@ -57,7 +57,7 @@ MwVulkanConfig vulkan_config = {
vk_res = func; \ vk_res = func; \
if(vk_res != VK_SUCCESS) { \ if(vk_res != VK_SUCCESS) { \
char buf[1024]; \ char buf[1024]; \
MwPrintIntoBuffer(buf, 1024, "Vulkan error (%s:%d): (error %d)\n", __FILE__, __LINE__, vk_res); \ MwStringPrintIntoBuffer(buf, 1024, "Vulkan error (%s:%d): (error %d)\n", __FILE__, __LINE__, vk_res); \
MwDispatchError(1, buf); \ MwDispatchError(1, buf); \
return 1; \ return 1; \
} }
@ -72,7 +72,7 @@ MwVulkanConfig vulkan_config = {
#define VK_ASSERT(val) \ #define VK_ASSERT(val) \
if(!val) { \ if(!val) { \
char buf[1024]; \ char buf[1024]; \
MwPrintIntoBuffer(buf, 1024, "Vulkan error (%s:%d): Assertion Failed (%s != NULL)\n", __FILE__, __LINE__, #val); \ MwStringPrintIntoBuffer(buf, 1024, "Vulkan error (%s:%d): Assertion Failed (%s != NULL)\n", __FILE__, __LINE__, #val); \
MwDispatchError(1, buf); \ MwDispatchError(1, buf); \
return 1; \ return 1; \
} }
@ -109,29 +109,26 @@ typedef struct vulkan {
int vkLayerCount; int vkLayerCount;
} vulkan_t; } vulkan_t;
static MwErrorEnum vulkan_instance_setup(MwWidget handle, vulkan_t* o); static int vulkan_instance_setup(MwWidget handle, vulkan_t* o);
static MwErrorEnum vulkan_surface_setup(MwWidget handle, vulkan_t* o); static int vulkan_surface_setup(MwWidget handle, vulkan_t* o);
static MwErrorEnum vulkan_devices_setup(MwWidget handle, vulkan_t* o); static int vulkan_devices_setup(MwWidget handle, vulkan_t* o);
static int create(MwWidget handle) { static int create(MwWidget handle) {
vulkan_t* o = malloc(sizeof(*o)); vulkan_t* o = malloc(sizeof(*o));
MwErrorEnum err; int err;
memset(o, 0, sizeof(*o)); memset(o, 0, sizeof(*o));
err = vulkan_instance_setup(handle, o); err = vulkan_instance_setup(handle, o);
if(err != 0) { if(err != 0) {
printf("%s", MwGetLastError());
return 1; return 1;
} }
err = vulkan_surface_setup(handle, o); err = vulkan_surface_setup(handle, o);
if(err != 0) { if(err != 0) {
printf("%s", MwGetLastError());
return 1; return 1;
} }
err = vulkan_devices_setup(handle, o); err = vulkan_devices_setup(handle, o);
if(err != 0) { if(err != 0) {
printf("%s", MwGetLastError());
return 1; return 1;
} }
@ -143,7 +140,7 @@ static int create(MwWidget handle) {
return 0; return 0;
} }
static MwErrorEnum _destroy(MwWidget handle) { static int _destroy(MwWidget handle) {
vulkan_t* o = (vulkan_t*)handle->internal; vulkan_t* o = (vulkan_t*)handle->internal;
LOAD_VK_FUNCTION(vkDestroyInstance); LOAD_VK_FUNCTION(vkDestroyInstance);
@ -164,10 +161,7 @@ static MwErrorEnum _destroy(MwWidget handle) {
} }
static void destroy(MwWidget handle) { static void destroy(MwWidget handle) {
MwErrorEnum err = _destroy(handle); int err = _destroy(handle);
if(err == 1) {
printf("[Vulkan Widget] %s", MwGetLastError());
}
} }
static void* vulkan_lib_load() { static void* vulkan_lib_load() {
@ -178,7 +172,7 @@ static void* vulkan_lib_load() {
#endif #endif
} }
static MwErrorEnum vulkan_instance_setup(MwWidget handle, vulkan_t* o) { static int vulkan_instance_setup(MwWidget handle, vulkan_t* o) {
uint32_t vulkan_version = vulkan_config.vk_version; uint32_t vulkan_version = vulkan_config.vk_version;
uint32_t api_version = vulkan_config.api_version; uint32_t api_version = vulkan_config.api_version;
uint32_t extension_count = 0; uint32_t extension_count = 0;
@ -299,7 +293,7 @@ static MwErrorEnum vulkan_instance_setup(MwWidget handle, vulkan_t* o) {
return 0; return 0;
} }
static MwErrorEnum vulkan_surface_setup(MwWidget handle, vulkan_t* o) { static int vulkan_surface_setup(MwWidget handle, vulkan_t* o) {
int vk_res; int vk_res;
#ifdef USE_GDI #ifdef USE_GDI
if(handle->lowlevel->common.type == MwLLBackendGDI) { if(handle->lowlevel->common.type == MwLLBackendGDI) {
@ -348,7 +342,7 @@ static MwErrorEnum vulkan_surface_setup(MwWidget handle, vulkan_t* o) {
return 0; return 0;
} }
static MwErrorEnum vulkan_devices_setup(MwWidget handle, vulkan_t* o) { static int vulkan_devices_setup(MwWidget handle, vulkan_t* o) {
(void)(handle); (void)(handle);
int vk_res; int vk_res;
@ -497,7 +491,7 @@ VkBool32 MwVulkanSupported(void) {
} }
}; };
static void* mwVulkanGetFieldImpl(MwWidget handle, MwVulkanField field, MwErrorEnum* out) { static void* mwVulkanGetFieldImpl(MwWidget handle, MwVulkanField field, int* out) {
vulkan_t* o = handle->internal; vulkan_t* o = handle->internal;
char buf[1024]; char buf[1024];
@ -536,7 +530,7 @@ static void* mwVulkanGetFieldImpl(MwWidget handle, MwVulkanField field, MwErrorE
static void func_handler(MwWidget handle, const char* name, void* out, va_list va) { static void func_handler(MwWidget handle, const char* name, void* out, va_list va) {
if(strcmp(name, "mwVulkanGetField") == 0) { if(strcmp(name, "mwVulkanGetField") == 0) {
MwVulkanField field = va_arg(va, MwVulkanField); MwVulkanField field = va_arg(va, MwVulkanField);
MwErrorEnum* err = va_arg(va, MwErrorEnum*); int* err = va_arg(va, int*);
*(void**)out = mwVulkanGetFieldImpl(handle, field, err); *(void**)out = mwVulkanGetFieldImpl(handle, field, err);
} }
} }