qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-10 15:22:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

[vulkan] Suppress all the debug output

Browse source 
silence is golden
This commit is contained in:
Bill Currie 2021-03-23 13:04:22 +09:00
parent 5d9bf32d3c
commit a0d47de439
8 changed files with 99 additions and 96 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
include/QF/sys.h
View file

@ -84,21 +84,22 @@ void Sys_TimeOfDay(date_t *date);
void Sys_MaskPrintf (int mask, const char *fmt, ...) __attribute__((format(printf,2,3)));
// remember to update developer_flags in cvar.c
#define SYS_DEV (1|0)
#define SYS_WARN (1|2) // bit 0 so developer 1 will pick it up
#define SYS_VID (1|4)
#define SYS_FS_NF (1|8)
#define SYS_FS_F (1|16)
#define SYS_FS (1|32)
#define SYS_NET (1|64)
#define SYS_RUA_OBJ (1|128)
#define SYS_RUA_MSG (1|256)
#define SYS_SND (1|512)
#define SYS_GLT (1|1024)
#define SYS_GLSL (1|2048)
#define SYS_SKIN (1|4096)
#define SYS_MODEL (1|8192)
#define SYS_VULKAN (1|16384)
#define SYS_DEV (1|0)
#define SYS_WARN (1|2) // bit 0 so developer 1 will pick it up
#define SYS_VID (1|4)
#define SYS_FS_NF (1|8)
#define SYS_FS_F (1|16)
#define SYS_FS (1|32)
#define SYS_NET (1|64)
#define SYS_RUA_OBJ (1|128)
#define SYS_RUA_MSG (1|256)
#define SYS_SND (1|512)
#define SYS_GLT (1|1024)
#define SYS_GLSL (1|2048)
#define SYS_SKIN (1|4096)
#define SYS_MODEL (1|8192)
#define SYS_VULKAN (1|16384)
#define SYS_VULKAN_PARSE (1|32768)
int Sys_CheckInput (int idle, int net_socket);
const char *Sys_ConsoleInput (void);

1
include/vid_vulkan.h
View file

@ -89,7 +89,6 @@ typedef struct vulkan_ctx_s {
VkCommandBuffer cmdbuffer;
VkFence fence; // for ctx->cmdbuffer only
struct qfv_stagebuf_s *staging;
VkPipeline pipeline;
size_t curFrame;
vulkan_frameset_t frames;

3
libs/audio/renderer/snd_channels.c
View file

@ -104,7 +104,8 @@ SND_AllocChannel (void)
for (free = &free_channels; *free; free = &(*free)->next) {
num_free++;
}
Sys_Printf ("SND_AllocChannel: out of channels. %d\n", num_free);
Sys_MaskPrintf (SYS_WARN, "SND_AllocChannel: out of channels. %d\n",
num_free);
return 0;
}
chan = *free;

20
libs/video/renderer/vid_render_vulkan.c
View file

@ -92,9 +92,6 @@ vulkan_R_Init (void)
Vulkan_CreateFrames (vulkan_ctx);
Vulkan_CreateRenderPass (vulkan_ctx);
Vulkan_CreateFramebuffers (vulkan_ctx);
// FIXME this should be staged so screen updates can begin while pipelines
// are being built
vulkan_ctx->pipeline = Vulkan_CreatePipeline (vulkan_ctx, "pipeline");
Vulkan_Texture_Init (vulkan_ctx);
Vulkan_Alias_Init (vulkan_ctx);
Vulkan_Bsp_Init (vulkan_ctx);
@ -104,13 +101,6 @@ vulkan_R_Init (void)
Vulkan_Compose_Init (vulkan_ctx);
Skin_Init ();
Sys_Printf ("R_Init %p %d", vulkan_ctx->swapchain->swapchain,
vulkan_ctx->swapchain->numImages);
for (int32_t i = 0; i < vulkan_ctx->swapchain->numImages; i++) {
Sys_Printf (" %p", vulkan_ctx->swapchain->images->a[i]);
}
Sys_Printf ("\n");
SCR_Init ();
}
@ -559,10 +549,10 @@ vulkan_vid_render_choose_visual (void)
cmdset);
vulkan_ctx->cmdbuffer = cmdset->a[0];
vulkan_ctx->fence = QFV_CreateFence (vulkan_ctx->device, 1);
Sys_Printf ("vk choose visual %p %p %d %p\n", vulkan_ctx->device->dev,
vulkan_ctx->device->queue.queue,
vulkan_ctx->device->queue.queueFamily,
vulkan_ctx->cmdpool);
Sys_MaskPrintf (SYS_VULKAN, "vk choose visual %p %p %d %p\n",
vulkan_ctx->device->dev, vulkan_ctx->device->queue.queue,
vulkan_ctx->device->queue.queueFamily,
vulkan_ctx->cmdpool);
}
static void
@ -570,7 +560,7 @@ vulkan_vid_render_create_context (void)
{
vulkan_ctx->create_window (vulkan_ctx);
vulkan_ctx->surface = vulkan_ctx->create_surface (vulkan_ctx);
Sys_Printf ("vk create context %p\n", vulkan_ctx->surface);
Sys_MaskPrintf (SYS_VULKAN, "vk create context %p\n", vulkan_ctx->surface);
}
static void

6
libs/video/renderer/vulkan/device.c
View file

@ -115,9 +115,11 @@ load_device_funcs (qfv_instance_t *inst, qfv_device_t *dev)
if (!ext || dev->extension_enabled (dev, ext)) { \
dfunc->name = (PFN_##name) ifunc->vkGetDeviceProcAddr (device, #name); \
if (!dfunc->name) { \
Sys_Printf ("Couldn't find device level function %s", #name); \
Sys_MaskPrintf (SYS_VULKAN_PARSE, \
"Couldn't find device level function %s", #name); \
} else { \
Sys_Printf ("Found device level function %s\n", #name); \
Sys_MaskPrintf (SYS_VULKAN_PARSE, \
"Found device level function %s\n", #name); \
} \
}

93
libs/video/renderer/vulkan/vkparse.c
View file

@ -159,9 +159,9 @@ parse_basic (const plfield_t *field, const plitem_t *item,
ectx.symtab = 0;
ectx.result = &result;
const char *valstr = PL_String (item);
//Sys_Printf ("parse_basic: %s %zd %d %p %p: %s\n",
// field->name, field->offset, field->type, field->parser,
// field->data, valstr);
//Sys_MaskPrintf (SYS_VULKAN_PARSE, "parse_basic: %s %zd %d %p %p: %s\n",
// field->name, field->offset, field->type, field->parser,
// field->data, valstr);
if (strcmp (valstr, "VK_SUBPASS_EXTERNAL") == 0) {
//FIXME handle subpass in a separate parser?
*(uint32_t *) data = VK_SUBPASS_EXTERNAL;
@ -172,7 +172,7 @@ parse_basic (const plfield_t *field, const plitem_t *item,
field->name, valstr);
}
}
//Sys_Printf (" %x\n", *(uint32_t *)data);
//Sys_MaskPrintf (SYS_VULKAN_PARSE, " %x\n", *(uint32_t *)data);
return ret;
}
@ -190,23 +190,24 @@ parse_uint32_t (const plfield_t *field, const plitem_t *item,
ectx.symtab = 0;
ectx.result = &result;
const char *valstr = PL_String (item);
//Sys_Printf ("parse_uint32_t: %s %zd %d %p %p: %s\n",
// field->name, field->offset, field->type, field->parser,
// field->data, valstr);
//Sys_MaskPrintf (SYS_VULKAN_PARSE, "parse_uint32_t: %s %zd %d %p %p: %s\n",
// field->name, field->offset, field->type, field->parser,
// field->data, valstr);
if (strcmp (valstr, "VK_SUBPASS_EXTERNAL") == 0) {
//FIXME handle subpass in a separate parser?
*(uint32_t *) data = VK_SUBPASS_EXTERNAL;
} else {
//Sys_Printf ("parse_uint32_t: %s %zd %d %p %p %s\n",
// field->name, field->offset, field->type, field->parser,
// field->data, valstr);
//Sys_MaskPrintf (SYS_VULKAN_PARSE,
// "parse_uint32_t: %s %zd %d %p %p %s\n",
// field->name, field->offset, field->type, field->parser,
// field->data, valstr);
ret = !cexpr_eval_string (valstr, &ectx);
if (!ret) {
PL_Message (messages, item, "error parsing %s: %s",
field->name, valstr);
}
*(uint32_t *) data = val;
//Sys_Printf (" %d\n", *(uint32_t *)data);
//Sys_MaskPrintf (SYS_VULKAN_PARSE, " %d\n", *(uint32_t *)data);
}
return ret;
@ -223,14 +224,14 @@ parse_enum (const plfield_t *field, const plitem_t *item,
ectx.symtab = enm->symtab;
ectx.result = &result;
const char *valstr = PL_String (item);
//Sys_Printf ("parse_enum: %s %zd %d %p %p %s\n",
// field->name, field->offset, field->type, field->parser,
// field->data, valstr);
//Sys_MaskPrintf (SYS_VULKAN_PARSE, "parse_enum: %s %zd %d %p %p %s\n",
// field->name, field->offset, field->type, field->parser,
// field->data, valstr);
ret = !cexpr_parse_enum (enm, valstr, &ectx, data);
if (!ret) {
PL_Message (messages, item, "error parsing enum: %s", valstr);
}
//Sys_Printf (" %d\n", *(int *)data);
//Sys_MaskPrintf (SYS_VULKAN_PARSE, " %d\n", *(int *)data);
return ret;
}
@ -266,8 +267,9 @@ parse_single (const plfield_t *field, const plitem_t *item,
__auto_type single = (parse_single_t *) field->data;
void *flddata = (byte *)data + single->value_offset;
//Sys_Printf ("parse_single: %s %zd %d %p %p\n", field->name, field->offset,
// field->type, field->parser, field->data);
//Sys_MaskPrintf (SYS_VULKAN_PARSE, "parse_single: %s %zd %d %p %p\n",
// field->name, field->offset,
// field->type, field->parser, field->data);
if (!PL_CheckType (single->type, PL_Type (item))) {
PL_TypeMismatch (messages, item, field->name, single->type,
@ -306,11 +308,12 @@ parse_array (const plfield_t *field, const plitem_t *item,
typedef struct arr_s DARRAY_TYPE(byte) arr_t;
arr_t *arr;
//Sys_Printf ("parse_array: %s %zd %d %p %p %p\n",
// field->name, field->offset, field->type, field->parser,
// field->data, data);
//Sys_Printf (" %d %zd %p %zd %zd\n", array->type, array->stride,
// array->parser, array->value_offset, array->size_offset);
//Sys_MaskPrintf (SYS_VULKAN_PARSE, "parse_array: %s %zd %d %p %p %p\n",
// field->name, field->offset, field->type, field->parser,
// field->data, data);
//Sys_MaskPrintf (SYS_VULKAN_PARSE, " %d %zd %p %zd %zd\n", array->type,
// array->stride, array->parser, array->value_offset,
// array->size_offset);
if (!PL_ParseArray (&f, item, &arr, messages, context)) {
return 0;
}
@ -333,11 +336,12 @@ parse_data (const plfield_t *field, const plitem_t *item,
const void *bindata = PL_BinaryData (item);
size_t binsize = PL_BinarySize (item);
Sys_Printf ("parse_data: %s %zd %d %p %p %p\n",
field->name, field->offset, field->type, field->parser,
field->data, data);
Sys_Printf (" %zd %zd\n", datad->value_offset, datad->size_offset);
Sys_Printf (" %zd %p\n", binsize, bindata);
Sys_MaskPrintf (SYS_VULKAN_PARSE, "parse_data: %s %zd %d %p %p %p\n",
field->name, field->offset, field->type, field->parser,
field->data, data);
Sys_MaskPrintf (SYS_VULKAN_PARSE, " %zd %zd\n", datad->value_offset,
datad->size_offset);
Sys_MaskPrintf (SYS_VULKAN_PARSE, " %zd %p\n", binsize, bindata);
*value = vkparse_alloc (context, binsize);
memcpy (*value, bindata, binsize);
@ -356,11 +360,11 @@ parse_string (const plfield_t *field, const plitem_t *item,
const char *str = PL_String (item);
//Sys_Printf ("parse_string: %s %zd %d %p %p %p\n",
// field->name, field->offset, field->type, field->parser,
// field->data, data);
//Sys_Printf (" %zd\n", string->value_offset);
//Sys_Printf (" %s\n", str);
//Sys_MaskPrintf (SYS_VULKAN_PARSE, "parse_string: %s %zd %d %p %p %p\n",
// field->name, field->offset, field->type, field->parser,
// field->data, data);
//Sys_MaskPrintf (SYS_VULKAN_PARSE, " %zd\n", string->value_offset);
//Sys_MaskPrintf (SYS_VULKAN_PARSE, " %s\n", str);
size_t len = strlen (str) + 1;
*value = vkparse_alloc (context, len);
@ -390,9 +394,10 @@ parse_RGBA (const plitem_t *item, void **data,
ectx.symtab = 0;
ectx.result = &result;
const char *valstr = PL_String (item);
Sys_Printf ("parse_RGBA: %s\n", valstr);
Sys_MaskPrintf (SYS_VULKAN_PARSE, "parse_RGBA: %s\n", valstr);
ret = !cexpr_eval_string (valstr, &ectx);
Sys_Printf (" "VEC4F_FMT"\n", VEC4_EXP (*(vec4f_t *)data[0]));
Sys_MaskPrintf (SYS_VULKAN_PARSE, " "VEC4F_FMT"\n",
VEC4_EXP (*(vec4f_t *)data[0]));
return ret;
}
@ -426,7 +431,7 @@ parse_VkRenderPass (const plitem_t *item, void **data,
vulkan_ctx_t *ctx = pctx->vctx;
const char *name = PL_String (item);
Sys_Printf ("parse_VkRenderPass: %s\n", name);
Sys_MaskPrintf (SYS_VULKAN_PARSE, "parse_VkRenderPass: %s\n", name);
if (name[0] != '$') {
name = va (ctx->va_ctx, "$"QFV_PROPERTIES".%s", name);
}
@ -483,7 +488,8 @@ parse_VkDescriptorSetLayout (const plfield_t *field, const plitem_t *item,
vulkan_ctx_t *ctx = pctx->vctx;
const char *name = PL_String (item);
Sys_Printf ("parse_VkDescriptorSetLayout: %s\n", name);
Sys_MaskPrintf (SYS_VULKAN_PARSE, "parse_VkDescriptorSetLayout: %s\n",
name);
if (name[0] != '$') {
name = va (ctx->va_ctx, "$"QFV_PROPERTIES".setLayouts.%s", name);
}
@ -519,7 +525,7 @@ parse_VkPipelineLayout (const plitem_t *item, void **data,
vulkan_ctx_t *ctx = context->vctx;
const char *name = PL_String (item);
Sys_Printf ("parse_VkPipelineLayout: %s\n", name);
Sys_MaskPrintf (SYS_VULKAN_PARSE, "parse_VkPipelineLayout: %s\n", name);
if (name[0] != '$') {
name = va (ctx->va_ctx, "$"QFV_PROPERTIES".pipelineLayouts.%s", name);
}
@ -554,7 +560,7 @@ parse_VkImage (const plitem_t *item, void **data, plitem_t *messages,
vulkan_ctx_t *ctx = context->vctx;
const char *name = PL_String (item);
Sys_Printf ("parse_VkImage: %s\n", name);
Sys_MaskPrintf (SYS_VULKAN_PARSE, "parse_VkImage: %s\n", name);
if (name[0] != '$') {
name = va (ctx->va_ctx, "$"QFV_PROPERTIES".images.%s", name);
}
@ -596,7 +602,7 @@ parse_VkImageView (const plfield_t *field, const plitem_t *item, void *data,
vulkan_ctx_t *ctx = context->vctx;
const char *name = PL_String (item);
Sys_Printf ("parse_VkImageView: %s\n", name);
Sys_MaskPrintf (SYS_VULKAN_PARSE, "parse_VkImageView: %s\n", name);
if (name[0] != '$') {
name = va (ctx->va_ctx, "$"QFV_PROPERTIES".imageViews.%s", name);
}
@ -981,7 +987,8 @@ parse_object (vulkan_ctx_t *ctx, memsuper_t *memsuper, plitem_t *plist,
if (!parser (0, plist, object, messages, &parsectx)) {
for (int i = 0; i < PL_A_NumObjects (messages); i++) {
Sys_Printf ("%s\n", PL_String (PL_ObjectAtIndex (messages, i)));
Sys_MaskPrintf (SYS_VULKAN_PARSE, "%s\n",
PL_String (PL_ObjectAtIndex (messages, i)));
}
return 0;
}
@ -1264,7 +1271,8 @@ QFV_ParseImageSet (vulkan_ctx_t *ctx, plitem_t *item, plitem_t *properties)
return 0;
}
} else {
Sys_Printf ("Neither array nor dictionary: %d\n", PL_Line (item));
Sys_MaskPrintf (SYS_VULKAN_PARSE, "Neither array nor dictionary: %d\n",
PL_Line (item));
delete_memsuper (memsuper);
return 0;
}
@ -1338,7 +1346,8 @@ QFV_ParseFramebuffer (vulkan_ctx_t *ctx, plitem_t *plist, plitem_t *properties)
VkFramebuffer framebuffer;
dfunc->vkCreateFramebuffer (device->dev, &cInfo, 0, &framebuffer);
printf ("framebuffer, renderPass: %p, %p\n", framebuffer, cInfo.renderPass);
Sys_MaskPrintf (SYS_VULKAN_PARSE, "framebuffer, renderPass: %p, %p\n",
framebuffer, cInfo.renderPass);
delete_memsuper (memsuper);
return framebuffer;

15
libs/video/renderer/vulkan/vulkan_lighting.c
View file

@ -481,14 +481,15 @@ Vulkan_LoadLights (model_t *model, const char *entity_data, vulkan_ctx_t *ctx)
mleaf_t *leaf = Mod_PointInLeaf (&light.position[0],
model);
DARRAY_APPEND (&lctx->lightleafs, leaf - model->brush.leafs);
printf ("[%g, %g, %g] %d, [%g %g %g] %g, [%g %g %g] %g, %zd\n",
VectorExpand (light.color), light.data,
VectorExpand (light.position), light.radius,
VectorExpand (light.direction), light.cone,
leaf - model->brush.leafs);
Sys_MaskPrintf (SYS_VULKAN,
"[%g, %g, %g] %d, "
"[%g %g %g] %g, [%g %g %g] %g, %zd\n",
VectorExpand (light.color), light.data,
VectorExpand (light.position), light.radius,
VectorExpand (light.direction), light.cone,
leaf - model->brush.leafs);
}
}
printf ("%zd frames\n", ctx->frames.size);
for (size_t i = 0; i < ctx->frames.size; i++) {
lightingframe_t *lframe = &lctx->frames.a[i];
DARRAY_RESIZE (&lframe->lightvis, lctx->lights.size);
@ -501,5 +502,5 @@ Vulkan_LoadLights (model_t *model, const char *entity_data, vulkan_ctx_t *ctx)
PL_Free (targets);
PL_Free (entities);
}
printf ("loaded %zd lights\n", lctx->lights.size);
Sys_MaskPrintf (SYS_VULKAN, "loaded %zd lights\n", lctx->lights.size);
}

26
libs/video/renderer/vulkan/vulkan_vid_common.c
View file

@ -166,11 +166,12 @@ static const char *device_extensions[] = {
void
Vulkan_Init_Common (vulkan_ctx_t *ctx)
{
Sys_Printf ("Vulkan_Init_Common\n");
Sys_MaskPrintf (SYS_VULKAN, "Vulkan_Init_Common\n");
QFV_InitParse (ctx);
Vulkan_Init_Cvars ();
ctx->instance = QFV_CreateInstance (ctx, PACKAGE_STRING, 0x000702ff, 0, instance_extensions);//FIXME version
ctx->instance = QFV_CreateInstance (ctx, PACKAGE_STRING, 0x000702ff, 0,
instance_extensions);//FIXME version
}
static void
@ -188,9 +189,6 @@ Vulkan_Shutdown_Common (vulkan_ctx_t *ctx)
{
PL_Free (ctx->pipelineDef);
PL_Free (ctx->renderpassDef);
if (ctx->pipeline) {
QFV_DestroyPipeline (ctx->device, ctx->pipeline);
}
if (ctx->frames.size) {
Vulkan_DestroyFrames (ctx);
}
@ -265,7 +263,7 @@ qfv_load_pipeline (vulkan_ctx_t *ctx, const char *name)
if (!item || !(item = PL_ObjectForKey (item, name))) {
Sys_Printf ("error loading %s\n", name);
} else {
Sys_Printf ("Found %s def\n", name);
Sys_MaskPrintf (SYS_VULKAN_PARSE, "Found %s def\n", name);
}
return item;
}
@ -282,7 +280,7 @@ qfv_load_renderpass (vulkan_ctx_t *ctx, const char *name)
if (!item || !(item = PL_ObjectForKey (item, name))) {
Sys_Printf ("error loading %s\n", name);
} else {
Sys_Printf ("Found %s def\n", name);
Sys_MaskPrintf (SYS_VULKAN_PARSE, "Found %s def\n", name);
}
return item;
}
@ -325,7 +323,6 @@ Vulkan_CreateRenderPass (vulkan_ctx_t *ctx)
name));
item = qfv_load_renderpass (ctx, "clearValues");
QFV_ParseClearValues (ctx, item, ctx->renderpassDef);
printf ("renderpass: %p\n", ctx->renderpass);
qfv_device_t *device = ctx->device;
qfv_devfuncs_t *dfunc = device->funcs;
@ -395,7 +392,7 @@ Vulkan_CreatePipeline (vulkan_ctx_t *ctx, const char *name)
Sys_Printf ("error loading pipeline %s\n", name);
return 0;
} else {
Sys_Printf ("Found pipeline def %s\n", name);
Sys_MaskPrintf (SYS_VULKAN_PARSE, "Found pipeline def %s\n", name);
}
VkPipeline pipeline = QFV_ParsePipeline (ctx, item, ctx->pipelineDef);
QFV_duSetObjectName (ctx->device, VK_OBJECT_TYPE_PIPELINE, pipeline,
@ -419,7 +416,8 @@ Vulkan_CreateDescriptorPool (vulkan_ctx_t *ctx, const char *name)
Sys_Printf ("error loading descriptor pool %s\n", name);
return 0;
} else {
Sys_Printf ("Found descriptor pool def %s\n", name);
Sys_MaskPrintf (SYS_VULKAN_PARSE, "Found descriptor pool def %s\n",
name);
}
pool = QFV_ParseDescriptorPool (ctx, item, ctx->pipelineDef);
QFV_AddHandle (tab, path, (uint64_t) pool);
@ -444,7 +442,8 @@ Vulkan_CreatePipelineLayout (vulkan_ctx_t *ctx, const char *name)
Sys_Printf ("error loading pipeline layout %s\n", name);
return 0;
} else {
Sys_Printf ("Found pipeline layout def %s\n", name);
Sys_MaskPrintf (SYS_VULKAN_PARSE, "Found pipeline layout def %s\n",
name);
}
layout = QFV_ParsePipelineLayout (ctx, item, ctx->pipelineDef);
QFV_AddHandle (tab, path, (uint64_t) layout);
@ -469,7 +468,7 @@ Vulkan_CreateSampler (vulkan_ctx_t *ctx, const char *name)
Sys_Printf ("error loading sampler %s\n", name);
return 0;
} else {
Sys_Printf ("Found sampler def %s\n", name);
Sys_MaskPrintf (SYS_VULKAN_PARSE, "Found sampler def %s\n", name);
}
sampler = QFV_ParseSampler (ctx, item, ctx->pipelineDef);
QFV_AddHandle (tab, path, (uint64_t) sampler);
@ -494,7 +493,8 @@ Vulkan_CreateDescriptorSetLayout(vulkan_ctx_t *ctx, const char *name)
Sys_Printf ("error loading descriptor set %s\n", name);
return 0;
} else {
Sys_Printf ("Found descriptor set def %s\n", name);
Sys_MaskPrintf (SYS_VULKAN_PARSE, "Found descriptor set def %s\n",
name);
}
set = QFV_ParseDescriptorSetLayout (ctx, item, ctx->pipelineDef);
QFV_AddHandle (tab, path, (uint64_t) set);