edgevoid/armorpaint
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix warnings

Browse Source
This commit is contained in:
luboslenco
2025-12-16 19:01:01 +01:00
parent 38a61078a7
commit 95c5bb88e8
3 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
base/sources/backends/vulkan_gpu.c
+4 -4
View File
@@ -606,7 +606,7 @@ static void create_swapchain() {
}
static void acquire_next_image() {
VkResult err = vkAcquireNextImageKHR(device, swapchain, UINT64_MAX, framebuffer_available_semaphore, VK_NULL_HANDLE, &framebuffer_index);
VkResult err = vkAcquireNextImageKHR(device, swapchain, UINT64_MAX, framebuffer_available_semaphore, VK_NULL_HANDLE, (uint32_t *)&framebuffer_index);
if (err == VK_ERROR_SURFACE_LOST_KHR || err == VK_ERROR_OUT_OF_DATE_KHR || err == VK_SUBOPTIMAL_KHR || surface_destroyed) {
surface_destroyed = surface_destroyed || (err == VK_ERROR_SURFACE_LOST_KHR);
gpu_in_use = false;
@@ -743,6 +743,7 @@ void gpu_init_internal(int depth_buffer_bits, bool vsync) {
score = 2;
break;
case VK_PHYSICAL_DEVICE_TYPE_INTEGRATED_GPU:
default:
score = 1;
break;
}
@@ -1191,7 +1192,7 @@ void gpu_present_internal() {
.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR,
.swapchainCount = 1,
.pSwapchains = &swapchain,
.pImageIndices = &framebuffer_index,
.pImageIndices = (uint32_t *)&framebuffer_index,
.pWaitSemaphores = &rendering_finished_semaphores[framebuffer_index],
.waitSemaphoreCount = 1,
};
@@ -1995,8 +1996,7 @@ void gpu_raytrace_pipeline_init(gpu_raytrace_pipeline_t *pipeline, void *ray_sha
{9, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, 1, VK_SHADER_STAGE_RAYGEN_BIT_KHR | VK_SHADER_STAGE_CLOSEST_HIT_BIT_KHR | VK_SHADER_STAGE_MISS_BIT_KHR},
{10, VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, 1, VK_SHADER_STAGE_RAYGEN_BIT_KHR | VK_SHADER_STAGE_CLOSEST_HIT_BIT_KHR | VK_SHADER_STAGE_MISS_BIT_KHR},
{11, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1, VK_SHADER_STAGE_RAYGEN_BIT_KHR | VK_SHADER_STAGE_CLOSEST_HIT_BIT_KHR | VK_SHADER_STAGE_MISS_BIT_KHR},
{12, VK_DESCRIPTOR_TYPE_SAMPLER, 1, VK_SHADER_STAGE_RAYGEN_BIT_KHR | VK_SHADER_STAGE_CLOSEST_HIT_BIT_KHR | VK_SHADER_STAGE_MISS_BIT_KHR, NULL, 0,
&linear_sampler}};
{12, VK_DESCRIPTOR_TYPE_SAMPLER, 1, VK_SHADER_STAGE_RAYGEN_BIT_KHR | VK_SHADER_STAGE_CLOSEST_HIT_BIT_KHR | VK_SHADER_STAGE_MISS_BIT_KHR}};
VkDescriptorSetLayoutCreateInfo layout_info = {
.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO,
base/sources/iron_string.c
+12 -4
View File
@@ -55,17 +55,25 @@ char *i32_to_string_hex(int32_t i) {
return r;
}
#ifdef IRON_WINDOWS
#define PERCENT_LD "%lld"
#define PERCENT_LU "%llu"
#else
#define PERCENT_LD "%ld"
#define PERCENT_LU "%lu"
#endif
char *i64_to_string(int64_t i) {
int l = snprintf(NULL, 0, "%lld", i);
int l = snprintf(NULL, 0, PERCENT_LD, i);
char *r = string_alloc(l + 1);
sprintf(r, "%lld", i);
sprintf(r, PERCENT_LD, i);
return r;
}
char *u64_to_string(uint64_t i) {
int l = snprintf(NULL, 0, "%llu", i);
int l = snprintf(NULL, 0, PERCENT_LU, i);
char *r = string_alloc(l + 1);
sprintf(r, "%llu", i);
sprintf(r, PERCENT_LU, i);
return r;
}
base/tools/make.js
+5 -4
View File
@@ -1808,6 +1808,7 @@ class MakeExporter extends Exporter {
this.cppFlags = cppFlags;
this.linkerFlags = linkerFlags;
this.outputExtension = outputExtension;
this.cFlags += " -Wno-incompatible-pointer-types";
if (libsLine != null) {
this.libsLine = libsLine;
}
@@ -1870,14 +1871,14 @@ class MakeExporter extends Exporter {
}
this.p("DEF=" + defline);
this.p();
let cline = this.cFlags;
cline = "-std=" + project.cStd + " ";
let cline = this.cFlags;
cline += " -std=" + project.cStd + " ";
for (let flag of project.cFlags) {
cline += flag + ' ';
}
this.p("CFLAGS=" + cline);
let cppline = this.cppFlags;
cppline = "-std=" + project.cppStd + " ";
let cppline = this.cppFlags;
cppline += " -std=" + project.cppStd + " ";
for (let flag of project.cppFlags) {
cppline += flag + " ";
}