Stefan Dösinger : wined3d: Make the alphaop == colorop matching a bit smarter.
Alexandre Julliard
julliard at winehq.org
Tue Aug 26 07:07:17 CDT 2008
Module: wine
Branch: master
Commit: 9b94c0abb9be631d1672ebad9c701e47250a5304
URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b94c0abb9be631d1672ebad9c701e47250a5304
Author: Stefan Dösinger <stefan at codeweavers.com>
Date: Mon Aug 18 16:50:04 2008 +0200
wined3d: Make the alphaop == colorop matching a bit smarter.
---
dlls/wined3d/arb_program_shader.c | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
index 99cc130..eb3eed8 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -2627,6 +2627,7 @@ static GLuint gen_arbfp_ffp_shader(struct ffp_settings *settings, IWineD3DStateB
DWORD arg0, arg1, arg2;
BOOL tempreg_used = FALSE, tfactor_used = FALSE;
BOOL last = FALSE;
+ BOOL op_equal;
/* Find out which textures are read */
for(stage = 0; stage < MAX_TEXTURES; stage++) {
@@ -2806,6 +2807,25 @@ static GLuint gen_arbfp_ffp_shader(struct ffp_settings *settings, IWineD3DStateB
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) {
gen_ffp_instr(&buffer, stage, TRUE, FALSE, last, settings->op[stage].dst,
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) {
shader_addline(&buffer, "MOV ret.a, fragment.color.primary.a;\n");
}
- } else if(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) {
+ } else if(op_equal) {
gen_ffp_instr(&buffer, stage, TRUE, TRUE, last, settings->op[stage].dst,
settings->op[stage].cop, settings->op[stage].carg0,
settings->op[stage].carg1, settings->op[stage].carg2);
More information about the wine-cvs
mailing list