Commit 5595ceb1 authored by Niklas Haas's avatar Niklas Haas

vulkan: msg consistency

No trailing newlines
parent 0591c1de
...@@ -97,7 +97,7 @@ const struct pl_filter *pl_filter_generate(struct pl_context *ctx, ...@@ -97,7 +97,7 @@ const struct pl_filter *pl_filter_generate(struct pl_context *ctx,
const struct pl_filter_params *params) const struct pl_filter_params *params)
{ {
if (params->lut_entries <= 0 || !params->config.kernel) { if (params->lut_entries <= 0 || !params->config.kernel) {
pl_fatal(ctx, "Invalid params: missing lut_entries or config.kernel\n"); pl_fatal(ctx, "Invalid params: missing lut_entries or config.kernel");
return NULL; return NULL;
} }
......
...@@ -600,7 +600,7 @@ static bool ra_buf_pool_grow(const struct ra *ra, struct ra_buf_pool *pool) ...@@ -600,7 +600,7 @@ static bool ra_buf_pool_grow(const struct ra *ra, struct ra_buf_pool *pool)
return false; return false;
TARRAY_INSERT_AT(NULL, pool->buffers, pool->num_buffers, pool->index, buf); TARRAY_INSERT_AT(NULL, pool->buffers, pool->num_buffers, pool->index, buf);
PL_DEBUG(ra, "Resized buffer pool of type %u to size %d\n", PL_DEBUG(ra, "Resized buffer pool of type %u to size %d",
pool->current_params.type, pool->num_buffers); pool->current_params.type, pool->num_buffers);
return true; return true;
} }
...@@ -679,7 +679,7 @@ bool ra_tex_recreate(const struct ra *ra, const struct ra_tex **tex, ...@@ -679,7 +679,7 @@ bool ra_tex_recreate(const struct ra *ra, const struct ra_tex **tex,
if (*tex && ra_tex_params_eq((*tex)->params, *params)) if (*tex && ra_tex_params_eq((*tex)->params, *params))
return true; return true;
PL_DEBUG(ra, "ra_tex_recreate: %dx%dx%d\n", params->w, params->h,params->d); PL_DEBUG(ra, "ra_tex_recreate: %dx%dx%d", params->w, params->h,params->d);
ra_tex_destroy(ra, tex); ra_tex_destroy(ra, tex);
*tex = ra_tex_create(ra, params); *tex = ra_tex_create(ra, params);
......
...@@ -92,7 +92,7 @@ static bool shaderc_compile(struct spirv_compiler *spirv, void *tactx, ...@@ -92,7 +92,7 @@ static bool shaderc_compile(struct spirv_compiler *spirv, void *tactx,
}; };
const char *status = s < PL_ARRAY_SIZE(results) ? results[s] : "unknown"; const char *status = s < PL_ARRAY_SIZE(results) ? results[s] : "unknown";
PL_MSG(spirv, lev, "shaderc compile status '%s' (%d errors, %d warnings)\n", PL_MSG(spirv, lev, "shaderc compile status '%s' (%d errors, %d warnings)",
status, errs, warn); status, errs, warn);
if (success) { if (success) {
......
...@@ -322,9 +322,9 @@ bool vk_flush_commands(struct vk_ctx *vk) ...@@ -322,9 +322,9 @@ bool vk_flush_commands(struct vk_ctx *vk)
PL_TRACE(vk, "Submitted command on queue %p (QF %d):", PL_TRACE(vk, "Submitted command on queue %p (QF %d):",
(void *)cmd->queue, pool->qf); (void *)cmd->queue, pool->qf);
for (int n = 0; n < cmd->num_deps; n++) for (int n = 0; n < cmd->num_deps; n++)
PL_TRACE(vk, " waits on semaphore %p\n", (void *)cmd->deps[n]); PL_TRACE(vk, " waits on semaphore %p", (void *)cmd->deps[n]);
for (int n = 0; n < cmd->num_sigs; n++) for (int n = 0; n < cmd->num_sigs; n++)
PL_TRACE(vk, " signals semaphore %p\n", (void *)cmd->sigs[n]); PL_TRACE(vk, " signals semaphore %p", (void *)cmd->sigs[n]);
} }
continue; continue;
......
...@@ -97,7 +97,7 @@ static void slab_free(struct vk_ctx *vk, struct vk_slab *slab) ...@@ -97,7 +97,7 @@ static void slab_free(struct vk_ctx *vk, struct vk_slab *slab)
// also implicitly unmaps the memory if needed // also implicitly unmaps the memory if needed
vkFreeMemory(vk->dev, slab->mem, VK_ALLOC); vkFreeMemory(vk->dev, slab->mem, VK_ALLOC);
PL_INFO(vk, "Freed slab of size %zu.\n", slab->size); PL_INFO(vk, "Freed slab of size %zu", slab->size);
talloc_free(slab); talloc_free(slab);
} }
...@@ -122,7 +122,7 @@ static bool find_best_memtype(struct vk_malloc *ma, uint32_t typeBits, ...@@ -122,7 +122,7 @@ static bool find_best_memtype(struct vk_malloc *ma, uint32_t typeBits,
} }
PL_ERR(vk, "Found no memory type matching property flags 0x%x and type " PL_ERR(vk, "Found no memory type matching property flags 0x%x and type "
"bits 0x%x!\n", (unsigned)flags, (unsigned)typeBits); "bits 0x%x!", (unsigned)flags, (unsigned)typeBits);
return false; return false;
} }
...@@ -179,7 +179,7 @@ static struct vk_slab *slab_alloc(struct vk_malloc *ma, struct vk_heap *heap, ...@@ -179,7 +179,7 @@ static struct vk_slab *slab_alloc(struct vk_malloc *ma, struct vk_heap *heap,
if (!find_best_memtype(ma, typeBits, heap->flags, &type, &index)) if (!find_best_memtype(ma, typeBits, heap->flags, &type, &index))
goto error; goto error;
PL_INFO(vk, "Allocating %zu memory of type 0x%x (id %d) in heap %d.\n", PL_INFO(vk, "Allocating %zu memory of type 0x%x (id %d) in heap %d",
slab->size, (unsigned)type.propertyFlags, index, (int)type.heapIndex); slab->size, (unsigned)type.propertyFlags, index, (int)type.heapIndex);
minfo.memoryTypeIndex = index; minfo.memoryTypeIndex = index;
...@@ -289,7 +289,7 @@ void vk_free_memslice(struct vk_malloc *ma, struct vk_memslice slice) ...@@ -289,7 +289,7 @@ void vk_free_memslice(struct vk_malloc *ma, struct vk_memslice slice)
assert(slab->used >= slice.size); assert(slab->used >= slice.size);
slab->used -= slice.size; slab->used -= slice.size;
PL_DEBUG(vk, "Freeing slice %zu + %zu from slab with size %zu\n", PL_DEBUG(vk, "Freeing slice %zu + %zu from slab with size %zu",
slice.offset, slice.size, slab->size); slice.offset, slice.size, slab->size);
if (slab->dedicated) { if (slab->dedicated) {
...@@ -415,7 +415,7 @@ static bool slice_heap(struct vk_malloc *ma, struct vk_heap *heap, size_t size, ...@@ -415,7 +415,7 @@ static bool slice_heap(struct vk_malloc *ma, struct vk_heap *heap, size_t size,
.priv = slab, .priv = slab,
}; };
PL_DEBUG(vk, "Sub-allocating slice %zu + %zu from slab with size %zu\n", PL_DEBUG(vk, "Sub-allocating slice %zu + %zu from slab with size %zu",
out->offset, out->size, slab->size); out->offset, out->size, slab->size);
size_t out_end = out->offset + out->size; size_t out_end = out->offset + out->size;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment