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

Some threading fixes (prevents some dead-locks).

This commit is contained in:
Lionel Ulmer 2003-06-04 23:16:28 +00:00 committed by Alexandre Julliard
parent 21856fbd1c
commit f87c54f14f
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/ddraw/d3ddevice/mesa.c
View File

@ -1666,6 +1666,8 @@ GL_IDirect3DDeviceImpl_7_3T_SetTextureStageState(LPDIRECT3DDEVICE7 iface,
This->state_block.texture_stage_state[dwStage][D3DTSS_ADDRESSU - 1] = dwState;
This->state_block.texture_stage_state[dwStage][D3DTSS_ADDRESSV - 1] = dwState;
}
ENTER_GL();
switch (d3dTexStageStateType) {
case D3DTSS_MINFILTER:
@ -2006,7 +2008,9 @@ GL_IDirect3DDeviceImpl_7_3T_SetTextureStageState(LPDIRECT3DDEVICE7 iface,
FIXME(" Unhandled stage type : %s => %08lx\n", type, dwState);
break;
}
LEAVE_GL();
return DD_OK;
}
@ -3016,7 +3020,9 @@ static void d3ddevice_flush_to_frame_buffer(IDirect3DDeviceImpl *d3d_dev, LPCREC
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, max_tex);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, min_tex);
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, tex_env);
LEAVE_GL();
d3d_dev->matrices_updated(d3d_dev, TEXMAT0_CHANGED);
ENTER_GL();
#if 0
/* I keep this code here as it's very useful to debug :-) */
{

1
dlls/ddraw/d3dtexture.c
View File

@ -723,6 +723,7 @@ gltex_bltfast(IDirectDrawSurfaceImpl *surf_ptr, DWORD dstx,
glReadBuffer(GL_BACK);
else {
ERR("Wrong surface type for locking !\n");
glBindTexture(GL_TEXTURE_2D, cur_tex);
LEAVE_GL();
return DDERR_INVALIDPARAMS;
}