Commit 1282b433 authored by Stefan Dösinger's avatar Stefan Dösinger Committed by Alexandre Julliard

wined3d: Restore blitting environment after modifying it.

parent b3f96f43
......@@ -964,6 +964,12 @@ static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This) {
vcheckGLcall("glPixelStorei GL_PACK_SWAP_BYTES");
}
/* Blitting environment requires that 2D texturing is enabled. It was turned off before,
* turn it on again
*/
glEnable(GL_TEXTURE_2D);
checkGLcall("glEnable(GL_TEXTURE_2D)");
if(memory_allocated) HeapFree(GetProcessHeap(), 0, mem);
return;
}
......@@ -2639,6 +2645,11 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT *
glEnd();
checkGLcall("glEnd");
if(Flags & (DDBLT_KEYSRC | DDBLT_KEYSRCOVERRIDE)) {
glDisable(GL_ALPHA_TEST);
checkGLcall("glDisable(GL_ALPHA_TEST)");
}
/* Unbind the texture */
glBindTexture(GL_TEXTURE_2D, 0);
checkGLcall("glEnable glBindTexture");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment