Commit 45aa1479 authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard

d3dcompiler: Get rid of the "dxversion" argument to SlWriteBytecode().

parent b52497c5
...@@ -2410,7 +2410,7 @@ static HRESULT call_instr_handler(struct bc_writer *writer, ...@@ -2410,7 +2410,7 @@ static HRESULT call_instr_handler(struct bc_writer *writer,
return E_INVALIDARG; 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 bc_writer *writer;
struct bytecode_buffer *buffer = NULL; struct bytecode_buffer *buffer = NULL;
......
...@@ -602,11 +602,11 @@ static HRESULT assemble_shader(const char *preproc_shader, ...@@ -602,11 +602,11 @@ static HRESULT assemble_shader(const char *preproc_shader,
return D3DXERR_INVALIDDATA; return D3DXERR_INVALIDDATA;
} }
hr = SlWriteBytecode(shader, 9, &res, &size); hr = shader_write_bytecode(shader, &res, &size);
SlDeleteShader(shader); SlDeleteShader(shader);
if (FAILED(hr)) if (FAILED(hr))
{ {
ERR("SlWriteBytecode failed with 0x%08x\n", hr); ERR("Failed to write bytecode, hr %#x.\n", hr);
return D3DXERR_INVALIDDATA; return D3DXERR_INVALIDDATA;
} }
...@@ -829,11 +829,11 @@ static HRESULT compile_shader(const char *preproc_shader, const char *target, co ...@@ -829,11 +829,11 @@ static HRESULT compile_shader(const char *preproc_shader, const char *target, co
return D3DXERR_INVALIDDATA; return D3DXERR_INVALIDDATA;
} }
hr = SlWriteBytecode(shader, 9, &res, &size); hr = shader_write_bytecode(shader, &res, &size);
SlDeleteShader(shader); SlDeleteShader(shader);
if (FAILED(hr)) if (FAILED(hr))
{ {
ERR("SlWriteBytecode failed with error 0x%08x.\n", hr); ERR("Failed to write bytecode, hr %#x.\n", hr);
return D3DXERR_INVALIDDATA; return D3DXERR_INVALIDDATA;
} }
......
...@@ -591,7 +591,7 @@ enum bwriterdeclusage ...@@ -591,7 +591,7 @@ enum bwriterdeclusage
#define T3_REG 5 #define T3_REG 5
struct bwriter_shader *SlAssembleShader(const char *text, char **messages) DECLSPEC_HIDDEN; 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; void SlDeleteShader(struct bwriter_shader *shader) DECLSPEC_HIDDEN;
/* The general IR structure is inspired by Mesa GLSL hir, even though the code /* The general IR structure is inspired by Mesa GLSL hir, even though the code
......
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