qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-05-31 08:41:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix some MXE build issues

Browse source 
Just some unused variables when vulkan debug is disabled and some scanf
formats for qfcc vectors (and the safety net).
This commit is contained in:
Bill Currie 2022-05-22 10:45:48 +09:00
parent 0d609efbc6
commit 8633ffe9d2
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libs/video/renderer/vulkan/resource.c
View file

@ -61,6 +61,7 @@ QFV_CreateResource (qfv_device_t *device, qfv_resource_t *resource)
buffer->buffer, name); buffer->buffer, name);
dfunc->vkGetBufferMemoryRequirements (device->dev, dfunc->vkGetBufferMemoryRequirements (device->dev,
buffer->buffer, &req); buffer->buffer, &req);
(void) name; // for when QFV_duSetObjectName is empty
} }
break; break;
case qfv_res_buffer_view: case qfv_res_buffer_view:
@ -92,6 +93,7 @@ QFV_CreateResource (qfv_device_t *device, qfv_resource_t *resource)
image->image, name); image->image, name);
dfunc->vkGetImageMemoryRequirements (device->dev, dfunc->vkGetImageMemoryRequirements (device->dev,
image->image, &req); image->image, &req);
(void) name; // for when QFV_duSetObjectName is empty
} }
break; break;
case qfv_res_image_view: case qfv_res_image_view:
@ -199,6 +201,7 @@ QFV_CreateResource (qfv_device_t *device, qfv_resource_t *resource)
resource->name, obj->name); resource->name, obj->name);
QFV_duSetObjectName (device, VK_OBJECT_TYPE_BUFFER_VIEW, QFV_duSetObjectName (device, VK_OBJECT_TYPE_BUFFER_VIEW,
buffview->view, name); buffview->view, name);
(void) name; // for when QFV_duSetObjectName is empty
} }
break; break;
case qfv_res_image_view: case qfv_res_image_view:
@ -215,6 +218,7 @@ QFV_CreateResource (qfv_device_t *device, qfv_resource_t *resource)
resource->name, obj->name); resource->name, obj->name);
QFV_duSetObjectName (device, VK_OBJECT_TYPE_IMAGE_VIEW, QFV_duSetObjectName (device, VK_OBJECT_TYPE_IMAGE_VIEW,
imgview->view, name); imgview->view, name);
(void) name; // for when QFV_duSetObjectName is empty
} }
break; break;
} }

8
tools/qfcc/source/qc-lex.l
View file

@ -567,21 +567,21 @@ parse_int_vector (const char *token, int width)
pr_type_t t[PR_SIZEOF (dvec4)]; pr_type_t t[PR_SIZEOF (dvec4)];
} long_data = {}; } long_data = {};
pr_type_t *data = __builtin_choose_expr ( 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) { switch (width) {
case 4: 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[0], &long_data.l[1],
&long_data.l[2], &long_data.l[3], &t1, &t2); &long_data.l[2], &long_data.l[3], &t1, &t2);
break; break;
case 3: 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[0], &long_data.l[1],
&long_data.l[2], &t1, &t2); &long_data.l[2], &t1, &t2);
break; break;
case 2: case 2:
sscanf (token, "' %li %li '%c%c", sscanf (token, "' %"SCNi64" %"SCNi64" '%c%c",
&long_data.l[0], &long_data.l[1], &t1, &t2); &long_data.l[0], &long_data.l[1], &t1, &t2);
break; break;
} }