Module: wine Branch: master Commit: b52497c53f076795910c0d978ed02c10e9e3ae28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b52497c53f076795910c0d978...
Author: Zebediah Figura z.figura12@gmail.com Date: Thu Mar 19 18:07:12 2020 -0500
d3dcompiler: Get rid of the "dxversion" argument to create_writer().
Signed-off-by: Zebediah Figura zfigura@codeweavers.com Signed-off-by: Matteo Bruni mbruni@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/d3dcompiler_43/bytecodewriter.c | 62 ++---------------------------------- 1 file changed, 3 insertions(+), 59 deletions(-)
diff --git a/dlls/d3dcompiler_43/bytecodewriter.c b/dlls/d3dcompiler_43/bytecodewriter.c index 42013dfba3..35da93fc6d 100644 --- a/dlls/d3dcompiler_43/bytecodewriter.c +++ b/dlls/d3dcompiler_43/bytecodewriter.c @@ -2327,7 +2327,8 @@ static void init_ps30_dx9_writer(struct bc_writer *writer) { writer->funcs = &ps_3_backend; }
-static struct bc_writer *create_writer(DWORD version, DWORD dxversion) { +static struct bc_writer *create_writer(DWORD version) +{ struct bc_writer *ret = d3dcompiler_alloc(sizeof(*ret));
if(!ret) { @@ -2337,101 +2338,44 @@ static struct bc_writer *create_writer(DWORD version, DWORD dxversion) {
switch(version) { case BWRITERVS_VERSION(1, 0): - if(dxversion != 9) { - WARN("Unsupported dxversion for vertex shader 1.0 requested: %u\n", dxversion); - goto fail; - } init_vs10_dx9_writer(ret); break; case BWRITERVS_VERSION(1, 1): - if(dxversion != 9) { - WARN("Unsupported dxversion for vertex shader 1.1 requested: %u\n", dxversion); - goto fail; - } init_vs11_dx9_writer(ret); break; case BWRITERVS_VERSION(2, 0): - if(dxversion != 9) { - WARN("Unsupported dxversion for vertex shader 2.0 requested: %u\n", dxversion); - goto fail; - } init_vs20_dx9_writer(ret); break; case BWRITERVS_VERSION(2, 1): - if(dxversion != 9) { - WARN("Unsupported dxversion for vertex shader 2.x requested: %u\n", dxversion); - goto fail; - } init_vs2x_dx9_writer(ret); break; case BWRITERVS_VERSION(3, 0): - if(dxversion != 9) { - WARN("Unsupported dxversion for vertex shader 3.0 requested: %u\n", dxversion); - goto fail; - } init_vs30_dx9_writer(ret); break; - case BWRITERPS_VERSION(1, 0): - if(dxversion != 9) { - WARN("Unsupported dxversion for pixel shader 1.0 requested: %u\n", dxversion); - goto fail; - } init_ps10_dx9_writer(ret); break; case BWRITERPS_VERSION(1, 1): - if(dxversion != 9) { - WARN("Unsupported dxversion for pixel shader 1.1 requested: %u\n", dxversion); - goto fail; - } init_ps11_dx9_writer(ret); break; case BWRITERPS_VERSION(1, 2): - if(dxversion != 9) { - WARN("Unsupported dxversion for pixel shader 1.2 requested: %u\n", dxversion); - goto fail; - } init_ps12_dx9_writer(ret); break; case BWRITERPS_VERSION(1, 3): - if(dxversion != 9) { - WARN("Unsupported dxversion for pixel shader 1.3 requested: %u\n", dxversion); - goto fail; - } init_ps13_dx9_writer(ret); break; case BWRITERPS_VERSION(1, 4): - if(dxversion != 9) { - WARN("Unsupported dxversion for pixel shader 1.4 requested: %u\n", dxversion); - goto fail; - } init_ps14_dx9_writer(ret); break; - case BWRITERPS_VERSION(2, 0): - if(dxversion != 9) { - WARN("Unsupported dxversion for pixel shader 2.0 requested: %u\n", dxversion); - goto fail; - } init_ps20_dx9_writer(ret); break; - case BWRITERPS_VERSION(2, 1): - if(dxversion != 9) { - WARN("Unsupported dxversion for pixel shader 2.x requested: %u\n", dxversion); - goto fail; - } init_ps2x_dx9_writer(ret); break; - case BWRITERPS_VERSION(3, 0): - if(dxversion != 9) { - WARN("Unsupported dxversion for pixel shader 3.0 requested: %u\n", dxversion); - goto fail; - } init_ps30_dx9_writer(ret); break; - default: WARN("Unexpected shader version requested: %08x\n", version); goto fail; @@ -2477,7 +2421,7 @@ HRESULT SlWriteBytecode(const struct bwriter_shader *shader, int dxversion, DWOR ERR("NULL shader structure, aborting\n"); return E_FAIL; } - writer = create_writer(shader->version, dxversion); + writer = create_writer(shader->version); *result = NULL;
if(!writer) {