ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Make the alphaop == colorop matching a bit smarter.

This commit is contained in:
Stefan Dösinger 2008-08-18 16:50:04 +02:00 committed by Alexandre Julliard
parent 4767be8cde
commit 9b94c0abb9
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dlls/wined3d/arb_program_shader.c
View File

@ -2627,6 +2627,7 @@ static GLuint gen_arbfp_ffp_shader(struct ffp_settings *settings, IWineD3DStateB
DWORD arg0, arg1, arg2; DWORD arg0, arg1, arg2;
BOOL tempreg_used = FALSE, tfactor_used = FALSE; BOOL tempreg_used = FALSE, tfactor_used = FALSE;
BOOL last = FALSE; BOOL last = FALSE;
BOOL op_equal;
/* Find out which textures are read */ /* Find out which textures are read */
for(stage = 0; stage < MAX_TEXTURES; stage++) { for(stage = 0; stage < MAX_TEXTURES; stage++) {
@ -2806,6 +2807,25 @@ static GLuint gen_arbfp_ffp_shader(struct ffp_settings *settings, IWineD3DStateB
last = TRUE; last = TRUE;
} }
if(settings->op[stage].cop == WINED3DTOP_SELECTARG1 &&
settings->op[stage].aop == WINED3DTOP_SELECTARG1) {
op_equal = settings->op[stage].carg1 == settings->op[stage].aarg1;
} else if(settings->op[stage].cop == WINED3DTOP_SELECTARG1 &&
settings->op[stage].aop == WINED3DTOP_SELECTARG2) {
op_equal = settings->op[stage].carg1 == settings->op[stage].aarg2;
} else if(settings->op[stage].cop == WINED3DTOP_SELECTARG2 &&
settings->op[stage].aop == WINED3DTOP_SELECTARG1) {
op_equal = settings->op[stage].carg2 == settings->op[stage].aarg1;
} else if(settings->op[stage].cop == WINED3DTOP_SELECTARG2 &&
settings->op[stage].aop == WINED3DTOP_SELECTARG2) {
op_equal = settings->op[stage].carg2 == settings->op[stage].aarg2;
} else {
op_equal = settings->op[stage].aop == settings->op[stage].cop &&
settings->op[stage].carg0 == settings->op[stage].aarg0 &&
settings->op[stage].carg1 == settings->op[stage].aarg1 &&
settings->op[stage].carg2 == settings->op[stage].aarg2;
}
if(settings->op[stage].aop == WINED3DTOP_DISABLE) { if(settings->op[stage].aop == WINED3DTOP_DISABLE) {
gen_ffp_instr(&buffer, stage, TRUE, FALSE, last, settings->op[stage].dst, gen_ffp_instr(&buffer, stage, TRUE, FALSE, last, settings->op[stage].dst,
settings->op[stage].cop, settings->op[stage].carg0, settings->op[stage].cop, settings->op[stage].carg0,
@ -2817,10 +2837,7 @@ static GLuint gen_arbfp_ffp_shader(struct ffp_settings *settings, IWineD3DStateB
} else if(stage == 0) { } else if(stage == 0) {
shader_addline(&buffer, "MOV ret.a, fragment.color.primary.a;\n"); shader_addline(&buffer, "MOV ret.a, fragment.color.primary.a;\n");
} }
} else if(settings->op[stage].aop == settings->op[stage].cop && } else if(op_equal) {
settings->op[stage].carg0 == settings->op[stage].aarg0 &&
settings->op[stage].carg1 == settings->op[stage].aarg1 &&
settings->op[stage].carg2 == settings->op[stage].aarg2) {
gen_ffp_instr(&buffer, stage, TRUE, TRUE, last, settings->op[stage].dst, gen_ffp_instr(&buffer, stage, TRUE, TRUE, last, settings->op[stage].dst,
settings->op[stage].cop, settings->op[stage].carg0, settings->op[stage].cop, settings->op[stage].carg0,
settings->op[stage].carg1, settings->op[stage].carg2); settings->op[stage].carg1, settings->op[stage].carg2);