reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-25 20:59:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

- protect viewport setting with GL lock

Browse Source 
- no need anymore to flush to FB on execute buffer calling
This commit is contained in:
Lionel Ulmer 2003-06-04 23:17:23 +00:00 committed by Alexandre Julliard
parent f87c54f14f
commit 241d306221
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2232,11 +2232,15 @@ GL_IDirect3DDeviceImpl_7_SetViewport(LPDIRECT3DDEVICE7 iface,
}
This->active_viewport = *lpData;
ENTER_GL();
/* Set the viewport */
glDepthRange(lpData->dvMinZ, lpData->dvMaxZ);
glViewport(lpData->dwX,
This->surface->surface_desc.dwHeight - (lpData->dwHeight + lpData->dwY),
lpData->dwWidth, lpData->dwHeight);
LEAVE_GL();
return DD_OK;
}

5
dlls/ddraw/d3dexecutebuffer.c
View File

@ -74,11 +74,6 @@ static void execute(IDirect3DExecuteBufferImpl *This,
if (TRACE_ON(ddraw))
_dump_executedata(&(This->data));
if (((IDirect3DDeviceGLImpl *) lpDevice)->state == SURFACE_MEMORY_DIRTY) {
lpDevice->flush_to_framebuffer(lpDevice, NULL, ((IDirect3DDeviceGLImpl *) lpDevice)->lock_surf);
}
((IDirect3DDeviceGLImpl *) lpDevice)->state = SURFACE_GL;
while (1) {
LPD3DINSTRUCTION current = (LPD3DINSTRUCTION) instr;
BYTE size;