system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-15 00:27:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
Signed-off-by: Zebediah Figura <zfigura@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 2020-03-19 18:07:12 -05:00 committed by Alexandre Julliard
parent e0948524f2
commit b52497c53f
1 changed files with 3 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
dlls/d3dcompiler_43/bytecodewriter.c
View file

@ -2327,7 +2327,8 @@ static void init_ps30_dx9_writer(struct bc_writer *writer) {
writer->funcs = &ps_3_backend; 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)); struct bc_writer *ret = d3dcompiler_alloc(sizeof(*ret));
if(!ret) { if(!ret) {
@ -2337,101 +2338,44 @@ static struct bc_writer *create_writer(DWORD version, DWORD dxversion) {
switch(version) { switch(version) {
case BWRITERVS_VERSION(1, 0): 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); init_vs10_dx9_writer(ret);
break; break;
case BWRITERVS_VERSION(1, 1): 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); init_vs11_dx9_writer(ret);
break; break;
case BWRITERVS_VERSION(2, 0): 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); init_vs20_dx9_writer(ret);
break; break;
case BWRITERVS_VERSION(2, 1): 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); init_vs2x_dx9_writer(ret);
break; break;
case BWRITERVS_VERSION(3, 0): 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); init_vs30_dx9_writer(ret);
break; break;
case BWRITERPS_VERSION(1, 0): 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); init_ps10_dx9_writer(ret);
break; break;
case BWRITERPS_VERSION(1, 1): 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); init_ps11_dx9_writer(ret);
break; break;
case BWRITERPS_VERSION(1, 2): 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); init_ps12_dx9_writer(ret);
break; break;
case BWRITERPS_VERSION(1, 3): 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); init_ps13_dx9_writer(ret);
break; break;
case BWRITERPS_VERSION(1, 4): 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); init_ps14_dx9_writer(ret);
break; break;
case BWRITERPS_VERSION(2, 0): 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); init_ps20_dx9_writer(ret);
break; break;
case BWRITERPS_VERSION(2, 1): 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); init_ps2x_dx9_writer(ret);
break; break;
case BWRITERPS_VERSION(3, 0): 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); init_ps30_dx9_writer(ret);
break; break;
default: default:
WARN("Unexpected shader version requested: %08x\n", version); WARN("Unexpected shader version requested: %08x\n", version);
goto fail; goto fail;
@ -2477,7 +2421,7 @@ HRESULT SlWriteBytecode(const struct bwriter_shader *shader, int dxversion, DWOR
ERR("NULL shader structure, aborting\n"); ERR("NULL shader structure, aborting\n");
return E_FAIL; return E_FAIL;
} }
writer = create_writer(shader->version, dxversion); writer = create_writer(shader->version);
*result = NULL; *result = NULL;
if(!writer) { if(!writer) {