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

wined3d: Initialize the texture op function properly.

This commit is contained in:
Stefan Dösinger 2008-08-01 11:47:24 -05:00 committed by Alexandre Julliard
parent 59e2155432
commit 228f2cf3c2
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/wined3d/utils.c
View File

@ -1792,6 +1792,7 @@ void gen_ffp_op(IWineD3DStateBlockImpl *stateblock, struct ffp_settings *setting
for(i = 0; i < GL_LIMITS(texture_stages); i++) {
IWineD3DBaseTextureImpl *texture;
settings->op[i].padding = 0;
if(stateblock->textureState[i][WINED3DTSS_COLOROP] == WINED3DTOP_DISABLE) {
settings->op[i].cop = WINED3DTOP_DISABLE;
settings->op[i].aop = WINED3DTOP_DISABLE;
@ -1800,6 +1801,8 @@ void gen_ffp_op(IWineD3DStateBlockImpl *stateblock, struct ffp_settings *setting
settings->op[i].aarg0 = settings->op[i].aarg1 = settings->op[i].aarg2 = 0x3F;
settings->op[i].color_correction = WINED3DFMT_UNKNOWN;
settings->op[i].dst = resultreg;
settings->op[i].tex_type = tex_1d;
settings->op[i].projected = proj_none;
i++;
break;
}

3
dlls/wined3d/wined3d_private.h
View File

@ -745,9 +745,10 @@ struct texture_stage_op
unsigned cop : 5, aop : 5;
unsigned carg1 : 6, carg2 : 6, carg0 : 6;
unsigned tex_type : 3;
unsigned dst : 1;
unsigned dst : 1; /* Total of 32 bits */
unsigned aarg1 : 6, aarg2 : 6, aarg0 : 6;
unsigned projected : 2;
unsigned padding : 12; /* Total of 64 bits */
WINED3DFORMAT color_correction;
};