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

- Fix bug in multitexturing introduced during dummy texture changes. 

- Additional traces.
This commit is contained in:
Jason Edmeades 2002-11-12 02:14:13 +00:00 committed by Alexandre Julliard
parent 544efc84f1
commit fcb753ee26
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/d3d8/device.c
View File

@ -1875,6 +1875,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_SetRenderState(LPDIRECT3DDEVICE8 iface, D3
default: default:
FIXME("Unrecognized/Unhandled D3DBLENDOP value %ld\n", Value); FIXME("Unrecognized/Unhandled D3DBLENDOP value %ld\n", Value);
} }
TRACE("glBlendEquation(%x)\n", glParm);
glBlendEquation(glParm); glBlendEquation(glParm);
checkGLcall("glBlendEquation"); checkGLcall("glBlendEquation");
} }
@ -2530,6 +2531,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_SetTexture(LPDIRECT3DDEVICE8 iface, DWORD
checkGLcall("glActiveTextureARB"); checkGLcall("glActiveTextureARB");
/* Decrement the count of the previous texture */ /* Decrement the count of the previous texture */
/* FIXME PERF: If old == new and not dirty then skip all this */
if (oldTxt != NULL) { if (oldTxt != NULL) {
IDirect3DBaseTexture8Impl_Release(oldTxt); IDirect3DBaseTexture8Impl_Release(oldTxt);
} }
@ -2828,7 +2830,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_SetTextureStageState(LPDIRECT3DDEVICE8 ifa
} else { } else {
/* Enable only the appropriate texture dimension */ /* Enable only the appropriate texture dimension */
if (Type==D3DTSS_ALPHAOP && Value != D3DTOP_DISABLE) { if (Type==D3DTSS_COLOROP) {
if (This->StateBlock.textureDimensions[Stage] == GL_TEXTURE_1D) { if (This->StateBlock.textureDimensions[Stage] == GL_TEXTURE_1D) {
glEnable(GL_TEXTURE_1D); glEnable(GL_TEXTURE_1D);
checkGLcall("Enable GL_TEXTURE_1D"); checkGLcall("Enable GL_TEXTURE_1D");
@ -2862,6 +2864,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_SetTextureStageState(LPDIRECT3DDEVICE8 ifa
case D3DTOP_SELECTARG1 : case D3DTOP_SELECTARG1 :
glTexEnvi(GL_TEXTURE_ENV, Parm, GL_REPLACE); glTexEnvi(GL_TEXTURE_ENV, Parm, GL_REPLACE);
checkGLcall("glTexEnvi(GL_TEXTURE_ENV, Parm, GL_REPLACE)");
break; break;
case D3DTOP_MODULATE4X : Scale = Scale * 2; /* Drop through */ case D3DTOP_MODULATE4X : Scale = Scale * 2; /* Drop through */
@ -2869,18 +2872,26 @@ HRESULT WINAPI IDirect3DDevice8Impl_SetTextureStageState(LPDIRECT3DDEVICE8 ifa
case D3DTOP_MODULATE : case D3DTOP_MODULATE :
/* Correct scale */ /* Correct scale */
if (Type == D3DTSS_ALPHAOP) glTexEnvi(GL_TEXTURE_ENV, GL_ALPHA_SCALE, Scale); if (Type == D3DTSS_ALPHAOP) {
else glTexEnvi(GL_TEXTURE_ENV, GL_RGB_SCALE_EXT, Scale); glTexEnvi(GL_TEXTURE_ENV, GL_ALPHA_SCALE, Scale);
checkGLcall("glTexEnvi(GL_TEXTURE_ENV, GL_ALPHA_SCALE, Scale)");
} else {
glTexEnvi(GL_TEXTURE_ENV, GL_RGB_SCALE_EXT, Scale);
checkGLcall("glTexEnvi(GL_TEXTURE_ENV, GL_RGB_SCALE_EXT, Scale)");
}
glTexEnvi(GL_TEXTURE_ENV, Parm, GL_MODULATE); glTexEnvi(GL_TEXTURE_ENV, Parm, GL_MODULATE);
checkGLcall("glTexEnvi(GL_TEXTURE_ENV, Parm, GL_MODULATE);");
break; break;
case D3DTOP_ADD : case D3DTOP_ADD :
glTexEnvi(GL_TEXTURE_ENV, Parm, GL_ADD); glTexEnvi(GL_TEXTURE_ENV, Parm, GL_ADD);
checkGLcall("glTexEnvi(GL_TEXTURE_ENV, Parm, GL_ADD)");
break; break;
case D3DTOP_ADDSIGNED2X : Scale = Scale * 2; /* Drop through */ case D3DTOP_ADDSIGNED2X : Scale = Scale * 2; /* Drop through */
case D3DTOP_ADDSIGNED : case D3DTOP_ADDSIGNED :
glTexEnvi(GL_TEXTURE_ENV, Parm, GL_ADD_SIGNED_EXT); glTexEnvi(GL_TEXTURE_ENV, Parm, GL_ADD_SIGNED_EXT);
checkGLcall("glTexEnvi(GL_TEXTURE_ENV, Parm, GL_ADD_SIGNED_EXT)");
break; break;
case D3DTOP_DOTPRODUCT3 : case D3DTOP_DOTPRODUCT3 :