From 45aa147945b30c9a90366e63c240200230afb472 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Thu, 19 Mar 2020 18:07:13 -0500 Subject: [PATCH] d3dcompiler: Get rid of the "dxversion" argument to SlWriteBytecode(). Signed-off-by: Zebediah Figura Signed-off-by: Matteo Bruni Signed-off-by: Alexandre Julliard --- dlls/d3dcompiler_43/bytecodewriter.c | 2 +- dlls/d3dcompiler_43/compiler.c | 8 ++++---- dlls/d3dcompiler_43/d3dcompiler_private.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3dcompiler_43/bytecodewriter.c b/dlls/d3dcompiler_43/bytecodewriter.c index 35da93fc6db..5366fa589b1 100644 --- a/dlls/d3dcompiler_43/bytecodewriter.c +++ b/dlls/d3dcompiler_43/bytecodewriter.c @@ -2410,7 +2410,7 @@ static HRESULT call_instr_handler(struct bc_writer *writer, return E_INVALIDARG; } -HRESULT SlWriteBytecode(const struct bwriter_shader *shader, int dxversion, DWORD **result, DWORD *size) +HRESULT shader_write_bytecode(const struct bwriter_shader *shader, DWORD **result, DWORD *size) { struct bc_writer *writer; struct bytecode_buffer *buffer = NULL; diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 73f8c705a00..9fc7c1d7734 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -602,11 +602,11 @@ static HRESULT assemble_shader(const char *preproc_shader, return D3DXERR_INVALIDDATA; } - hr = SlWriteBytecode(shader, 9, &res, &size); + hr = shader_write_bytecode(shader, &res, &size); SlDeleteShader(shader); if (FAILED(hr)) { - ERR("SlWriteBytecode failed with 0x%08x\n", hr); + ERR("Failed to write bytecode, hr %#x.\n", hr); return D3DXERR_INVALIDDATA; } @@ -829,11 +829,11 @@ static HRESULT compile_shader(const char *preproc_shader, const char *target, co return D3DXERR_INVALIDDATA; } - hr = SlWriteBytecode(shader, 9, &res, &size); + hr = shader_write_bytecode(shader, &res, &size); SlDeleteShader(shader); if (FAILED(hr)) { - ERR("SlWriteBytecode failed with error 0x%08x.\n", hr); + ERR("Failed to write bytecode, hr %#x.\n", hr); return D3DXERR_INVALIDDATA; } diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 1a9d68e7206..51cfc395524 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -591,7 +591,7 @@ enum bwriterdeclusage #define T3_REG 5 struct bwriter_shader *SlAssembleShader(const char *text, char **messages) DECLSPEC_HIDDEN; -HRESULT SlWriteBytecode(const struct bwriter_shader *shader, int dxversion, DWORD **result, DWORD *size) DECLSPEC_HIDDEN; +HRESULT shader_write_bytecode(const struct bwriter_shader *shader, DWORD **result, DWORD *size) DECLSPEC_HIDDEN; void SlDeleteShader(struct bwriter_shader *shader) DECLSPEC_HIDDEN; /* The general IR structure is inspired by Mesa GLSL hir, even though the code