mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-05-20 00:28:08 +02:00
20fcd152a2
The error buffer is limited to 256, but the report contains the
filename and possibly other data. So give it more space.
Avoids the warnings
../../src/intel/vulkan/anv_util.c: In function ‘__anv_perf_warn’:
../../src/intel/vulkan/anv_util.c:66:42: warning: ‘%s’ directive output may be truncated writing up to 255 bytes into a region of size 254 [-Wformat-truncation=]
snprintf(report, sizeof(report), "%s: %s", file, buffer);
^~ ~~~~~~
../../src/intel/vulkan/anv_util.c:66:4: note: ‘snprintf’ output 3 or more bytes (assuming 258) into a destination of size 256
snprintf(report, sizeof(report), "%s: %s", file, buffer);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../../src/intel/vulkan/anv_util.c: In function ‘__vk_errorf’:
../../src/intel/vulkan/anv_util.c:96:48: warning: ‘%s’ directive output may be truncated writing up to 255 bytes into a region of size 252 [-Wformat-truncation=]
snprintf(report, sizeof(report), "%s:%d: %s (%s)", file, line, buffer,
^~ ~~~~~~
../../src/intel/vulkan/anv_util.c:96:7: note: ‘snprintf’ output 8 or more bytes (assuming 263) into a destination of size 256
snprintf(report, sizeof(report), "%s:%d: %s (%s)", file, line, buffer,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
error_str);
~~~~~~~~~~
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
120 lines
3.5 KiB
C
120 lines
3.5 KiB
C
/*
|
|
* Copyright © 2015 Intel Corporation
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice (including the next
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
* Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
|
* IN THE SOFTWARE.
|
|
*/
|
|
|
|
#include <stdarg.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <errno.h>
|
|
#include <assert.h>
|
|
|
|
#include "anv_private.h"
|
|
#include "vk_enum_to_str.h"
|
|
#include "util/debug.h"
|
|
|
|
/** Log an error message. */
|
|
void anv_printflike(1, 2)
|
|
anv_loge(const char *format, ...)
|
|
{
|
|
va_list va;
|
|
|
|
va_start(va, format);
|
|
anv_loge_v(format, va);
|
|
va_end(va);
|
|
}
|
|
|
|
/** \see anv_loge() */
|
|
void
|
|
anv_loge_v(const char *format, va_list va)
|
|
{
|
|
intel_loge_v(format, va);
|
|
}
|
|
|
|
void anv_printflike(6, 7)
|
|
__anv_perf_warn(struct anv_instance *instance, const void *object,
|
|
VkDebugReportObjectTypeEXT type,
|
|
const char *file, int line, const char *format, ...)
|
|
{
|
|
va_list ap;
|
|
char buffer[256];
|
|
char report[512];
|
|
|
|
va_start(ap, format);
|
|
vsnprintf(buffer, sizeof(buffer), format, ap);
|
|
va_end(ap);
|
|
|
|
snprintf(report, sizeof(report), "%s: %s", file, buffer);
|
|
|
|
vk_debug_report(&instance->debug_report_callbacks,
|
|
VK_DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT,
|
|
type,
|
|
(uint64_t) (uintptr_t) object,
|
|
line,
|
|
0,
|
|
"anv",
|
|
report);
|
|
|
|
intel_logw("%s:%d: PERF: %s", file, line, buffer);
|
|
}
|
|
|
|
VkResult
|
|
__vk_errorf(struct anv_instance *instance, const void *object,
|
|
VkDebugReportObjectTypeEXT type, VkResult error,
|
|
const char *file, int line, const char *format, ...)
|
|
{
|
|
va_list ap;
|
|
char buffer[256];
|
|
char report[512];
|
|
|
|
const char *error_str = vk_Result_to_str(error);
|
|
|
|
if (format) {
|
|
va_start(ap, format);
|
|
vsnprintf(buffer, sizeof(buffer), format, ap);
|
|
va_end(ap);
|
|
|
|
snprintf(report, sizeof(report), "%s:%d: %s (%s)", file, line, buffer,
|
|
error_str);
|
|
} else {
|
|
snprintf(report, sizeof(report), "%s:%d: %s", file, line, error_str);
|
|
}
|
|
|
|
if (instance) {
|
|
vk_debug_report(&instance->debug_report_callbacks,
|
|
VK_DEBUG_REPORT_ERROR_BIT_EXT,
|
|
type,
|
|
(uint64_t) (uintptr_t) object,
|
|
line,
|
|
0,
|
|
"anv",
|
|
report);
|
|
}
|
|
|
|
intel_loge("%s", report);
|
|
|
|
if (error == VK_ERROR_DEVICE_LOST &&
|
|
env_var_as_boolean("ANV_ABORT_ON_DEVICE_LOSS", false))
|
|
abort();
|
|
|
|
return error;
|
|
}
|