wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader: Replace hlsl_message() with hlsl_error().

Browse Source 
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2021-02-21 22:04:37 -06:00 committed by Alexandre Julliard
parent 6124aa664f
commit 7069fa1c40
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libs/vkd3d-shader/hlsl.c
View File

@ -20,11 +20,6 @@
#include "hlsl.h" #include "hlsl.h"
#include <stdio.h> #include <stdio.h>
void hlsl_message(const char *fmt, ...)
{
/* FIXME */
}
void hlsl_note(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, void hlsl_note(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc,
enum vkd3d_shader_log_level level, const char *fmt, ...) enum vkd3d_shader_log_level level, const char *fmt, ...)
{ {

2
libs/vkd3d-shader/hlsl.h
View File

@ -544,8 +544,6 @@ struct hlsl_ir_var *hlsl_new_var(const char *name, struct hlsl_type *type, const
const struct hlsl_reg_reservation *reg_reservation) DECLSPEC_HIDDEN; const struct hlsl_reg_reservation *reg_reservation) DECLSPEC_HIDDEN;
struct hlsl_ir_load *hlsl_new_var_load(struct hlsl_ir_var *var, const struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; struct hlsl_ir_load *hlsl_new_var_load(struct hlsl_ir_var *var, const struct vkd3d_shader_location loc) DECLSPEC_HIDDEN;
void hlsl_message(const char *fmt, ...) VKD3D_PRINTF_FUNC(1,2) DECLSPEC_HIDDEN;
void hlsl_error(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, enum vkd3d_shader_error error, void hlsl_error(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, enum vkd3d_shader_error error,
const char *fmt, ...) VKD3D_PRINTF_FUNC(4, 5) DECLSPEC_HIDDEN; const char *fmt, ...) VKD3D_PRINTF_FUNC(4, 5) DECLSPEC_HIDDEN;
void hlsl_warning(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, enum vkd3d_shader_error error, void hlsl_warning(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, enum vkd3d_shader_error error,

4
libs/vkd3d-shader/hlsl.y
View File

@ -3110,7 +3110,9 @@ int hlsl_parser_compile(struct hlsl_ctx *ctx, const char *entrypoint)
if (!(entry_func = get_func_entry(ctx, entrypoint))) if (!(entry_func = get_func_entry(ctx, entrypoint)))
{ {
hlsl_message("error: entry point \"%s\" is not defined\n", entrypoint); const struct vkd3d_shader_location loc = {.source_name = ctx->location.source_name};
hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_NOT_DEFINED, "Entry point \"%s\" is not defined.", entrypoint);
return VKD3D_ERROR_INVALID_SHADER; return VKD3D_ERROR_INVALID_SHADER;
} }