Skip to content

W
wine-cw
Commit 0ce3cb23 authored by Stefan Dösinger's avatar Stefan Dösinger Committed by Alexandre Julliard
Browse files
Options

wined3d: Disable the depth test in UnlockRect

parent c60f296b
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
dlls/wined3d/surface.c
View file @ 0ce3cb23
...@@ -746,6 +746,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_UnlockRect(IWineD3DSurface *iface) { ...@@ -746,6 +746,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_UnlockRect(IWineD3DSurface *iface) {
if (iface == implSwapChain->backBuffer || iface == implSwapChain->frontBuffer || iface == myDevice->renderTarget) { if (iface == implSwapChain->backBuffer || iface == implSwapChain->frontBuffer || iface == myDevice->renderTarget) {
GLint prev_store; GLint prev_store;
GLint prev_draw; GLint prev_draw;
GLint prev_depth_test;
GLint prev_rasterpos[4]; GLint prev_rasterpos[4];
/* Some drivers(radeon dri, others?) don't like exceptions during /* Some drivers(radeon dri, others?) don't like exceptions during
...@@ -776,6 +777,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_UnlockRect(IWineD3DSurface *iface) { ...@@ -776,6 +777,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_UnlockRect(IWineD3DSurface *iface) {
vcheckGLcall("glIntegerv"); vcheckGLcall("glIntegerv");
glPixelZoom(1.0, -1.0); glPixelZoom(1.0, -1.0);
vcheckGLcall("glPixelZoom"); vcheckGLcall("glPixelZoom");
prev_depth_test = glIsEnabled(GL_DEPTH_TEST);
/* glDrawPixels transforms the raster position as though it was a vertex - /* glDrawPixels transforms the raster position as though it was a vertex -
we want to draw at screen position 0,0 - Set up ortho (rhw) mode as we want to draw at screen position 0,0 - Set up ortho (rhw) mode as
...@@ -796,6 +798,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_UnlockRect(IWineD3DSurface *iface) { ...@@ -796,6 +798,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_UnlockRect(IWineD3DSurface *iface) {
/* And back buffers are not blended */ /* And back buffers are not blended */
glDisable(GL_BLEND); glDisable(GL_BLEND);
glDisable(GL_DEPTH_TEST);
glRasterPos3i(This->lockedRect.left, This->lockedRect.top, 1); glRasterPos3i(This->lockedRect.left, This->lockedRect.top, 1);
vcheckGLcall("glRasterPos2f"); vcheckGLcall("glRasterPos2f");
...@@ -897,6 +900,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_UnlockRect(IWineD3DSurface *iface) { ...@@ -897,6 +900,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_UnlockRect(IWineD3DSurface *iface) {
vcheckGLcall("glDrawBuffer"); vcheckGLcall("glDrawBuffer");
glRasterPos3iv(&prev_rasterpos[0]); glRasterPos3iv(&prev_rasterpos[0]);
vcheckGLcall("glRasterPos3iv"); vcheckGLcall("glRasterPos3iv");
if(prev_depth_test) glEnable(GL_DEPTH_TEST);
/* Reset to previous pack row length / blending state */ /* Reset to previous pack row length / blending state */
glPixelStorei(GL_UNPACK_ROW_LENGTH, skipBytes); glPixelStorei(GL_UNPACK_ROW_LENGTH, skipBytes);
......
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