system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-14 23:27:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

wined3d: Use surface_get_gl_buffer where appropriate.

Browse source
This commit is contained in:
H. Verbeet 2007-04-16 21:20:32 +02:00 committed by Alexandre Julliard
parent 1b9a5ba682
commit 5fddfd5bbc
1 changed files with 16 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
dlls/wined3d/surface.c
View file

@ -809,19 +809,11 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED
glReadBuffer(myDevice->offscreenBuffer); glReadBuffer(myDevice->offscreenBuffer);
srcIsUpsideDown = TRUE; srcIsUpsideDown = TRUE;
} else { } else {
if(iface == swapchain->frontBuffer) { GLenum buffer = surface_get_gl_buffer(iface, (IWineD3DSwapChain *)swapchain);
TRACE("Locking the front buffer\n"); TRACE("Locking %#x buffer\n", buffer);
glReadBuffer(GL_FRONT); glReadBuffer(buffer);
} else if(swapchain->backBuffer && iface == swapchain->backBuffer[0]) { checkGLcall("glReadBuffer");
TRACE("Locking the back buffer\n");
glReadBuffer(GL_BACK);
} else {
/* Ok, there is an issue: OpenGL does not guarant any back buffer number, so all we can do is to read GL_BACK
* and hope it gives what the app wants
*/
FIXME("Application is locking a 2nd or higher back buffer\n");
glReadBuffer(GL_BACK);
}
IWineD3DSwapChain_Release((IWineD3DSwapChain *) swapchain); IWineD3DSwapChain_Release((IWineD3DSwapChain *) swapchain);
srcIsUpsideDown = FALSE; srcIsUpsideDown = FALSE;
} }
@ -1207,19 +1199,11 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_UnlockRect(IWineD3DSurface *iface) {
glDrawBuffer(myDevice->offscreenBuffer); glDrawBuffer(myDevice->offscreenBuffer);
checkGLcall("glDrawBuffer(myDevice->offscreenBuffer)"); checkGLcall("glDrawBuffer(myDevice->offscreenBuffer)");
} else { } else {
if(iface == swapchain->frontBuffer) { GLenum buffer = surface_get_gl_buffer(iface, (IWineD3DSwapChain *)swapchain);
TRACE("Onscreen front buffer\n"); TRACE("Unlocking %#x buffer\n", buffer);
glDrawBuffer(GL_FRONT); glDrawBuffer(buffer);
checkGLcall("glDrawBuffer(GL_FRONT)"); checkGLcall("glDrawBuffer");
} else if(iface == swapchain->backBuffer[0]) {
TRACE("Onscreen back buffer\n");
glDrawBuffer(GL_BACK);
checkGLcall("glDrawBuffer(GL_BACK)");
} else {
FIXME("Unlocking a higher back buffer\n");
glDrawBuffer(GL_BACK);
checkGLcall("glDrawBuffer(GL_BACK)");
}
IWineD3DSwapChain_Release((IWineD3DSwapChain *)swapchain); IWineD3DSwapChain_Release((IWineD3DSwapChain *)swapchain);
} }
@ -2364,10 +2348,9 @@ static inline void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *This, IWineD3D
checkGLcall("glBindTexture"); checkGLcall("glBindTexture");
if(!swapchain) { if(!swapchain) {
glReadBuffer(myDevice->offscreenBuffer); glReadBuffer(myDevice->offscreenBuffer);
} else if(swapchain->backBuffer && SrcSurface == swapchain->backBuffer[0]) {
glReadBuffer(GL_BACK);
} else { } else {
glReadBuffer(GL_FRONT); GLenum buffer = surface_get_gl_buffer(SrcSurface, (IWineD3DSwapChain *)swapchain);
glReadBuffer(buffer);
} }
checkGLcall("glReadBuffer"); checkGLcall("glReadBuffer");
@ -2877,14 +2860,11 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT *
if(!dstSwapchain) { if(!dstSwapchain) {
TRACE("Drawing to offscreen buffer\n"); TRACE("Drawing to offscreen buffer\n");
glDrawBuffer(myDevice->offscreenBuffer); glDrawBuffer(myDevice->offscreenBuffer);
} else if(This == (IWineD3DSurfaceImpl *) dstSwapchain->frontBuffer) {
TRACE("Drawing to front buffer\n");
glDrawBuffer(GL_FRONT);
checkGLcall("glDrawBuffer GL_FRONT");
} else { } else {
TRACE("Drawing to back buffer\n"); GLenum buffer = surface_get_gl_buffer((IWineD3DSurface *)This, (IWineD3DSwapChain *)dstSwapchain);
glDrawBuffer(GL_BACK); TRACE("Drawing to %#x buffer\n", buffer);
checkGLcall("glDrawBuffer GL_BACK"); glDrawBuffer(buffer);
checkGLcall("glDrawBuffer");
} }
/* Bind the texture */ /* Bind the texture */