From 8633ffe9d22403baa33c7bedc69154feacb04586 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Sun, 22 May 2022 10:45:48 +0900 Subject: [PATCH] Fix some MXE build issues Just some unused variables when vulkan debug is disabled and some scanf formats for qfcc vectors (and the safety net). --- libs/video/renderer/vulkan/resource.c | 4 ++++ tools/qfcc/source/qc-lex.l | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/libs/video/renderer/vulkan/resource.c b/libs/video/renderer/vulkan/resource.c index 2eb08e6d7..b89b298b9 100644 --- a/libs/video/renderer/vulkan/resource.c +++ b/libs/video/renderer/vulkan/resource.c @@ -61,6 +61,7 @@ QFV_CreateResource (qfv_device_t *device, qfv_resource_t *resource) buffer->buffer, name); dfunc->vkGetBufferMemoryRequirements (device->dev, buffer->buffer, &req); + (void) name; // for when QFV_duSetObjectName is empty } break; case qfv_res_buffer_view: @@ -92,6 +93,7 @@ QFV_CreateResource (qfv_device_t *device, qfv_resource_t *resource) image->image, name); dfunc->vkGetImageMemoryRequirements (device->dev, image->image, &req); + (void) name; // for when QFV_duSetObjectName is empty } break; case qfv_res_image_view: @@ -199,6 +201,7 @@ QFV_CreateResource (qfv_device_t *device, qfv_resource_t *resource) resource->name, obj->name); QFV_duSetObjectName (device, VK_OBJECT_TYPE_BUFFER_VIEW, buffview->view, name); + (void) name; // for when QFV_duSetObjectName is empty } break; case qfv_res_image_view: @@ -215,6 +218,7 @@ QFV_CreateResource (qfv_device_t *device, qfv_resource_t *resource) resource->name, obj->name); QFV_duSetObjectName (device, VK_OBJECT_TYPE_IMAGE_VIEW, imgview->view, name); + (void) name; // for when QFV_duSetObjectName is empty } break; } diff --git a/tools/qfcc/source/qc-lex.l b/tools/qfcc/source/qc-lex.l index 495d69aa9..beaba7b4f 100644 --- a/tools/qfcc/source/qc-lex.l +++ b/tools/qfcc/source/qc-lex.l @@ -567,21 +567,21 @@ parse_int_vector (const char *token, int width) pr_type_t t[PR_SIZEOF (dvec4)]; } long_data = {}; pr_type_t *data = __builtin_choose_expr ( - sizeof (pr_long_t) == sizeof (long), long_data.t, (void) 0); + sizeof (pr_long_t) == sizeof (int64_t), long_data.t, (void) 0); switch (width) { case 4: - sscanf (token, "' %li %li %li %li '%c%c", + sscanf (token, "' %"SCNi64" %"SCNi64" %"SCNi64" %"SCNi64" '%c%c", &long_data.l[0], &long_data.l[1], &long_data.l[2], &long_data.l[3], &t1, &t2); break; case 3: - sscanf (token, "' %li %li %li '%c%c", + sscanf (token, "' %"SCNi64" %"SCNi64" %"SCNi64" '%c%c", &long_data.l[0], &long_data.l[1], &long_data.l[2], &t1, &t2); break; case 2: - sscanf (token, "' %li %li '%c%c", + sscanf (token, "' %"SCNi64" %"SCNi64" '%c%c", &long_data.l[0], &long_data.l[1], &t1, &t2); break; }