wined3d: Remove an old hack around Mesa choking on protected memory from flush_to_framebuffer_drawpixels.
Gerald Pfeifer
gerald at pfeifer.com
Mon May 24 14:54:48 CDT 2010
This is in response to Stefan's feedback
(http://www.winehq.org/pipermail/wine-devel/2010-May/083480.html)
for a previous version of this patch of mine
(http://www.winehq.org/pipermail/wine-patches/2010-May/088229.html).
I believe one of the two patches, my original one or this new one (or a
variation thereof) should be applied. Stefan, I hope it got you right?
Gerald
---
dlls/wined3d/surface.c | 16 ----------------
1 files changed, 0 insertions(+), 16 deletions(-)
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index ca796c5..a134610 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -1822,22 +1822,6 @@ static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This, GLenum fm
glRasterPos3i(This->lockedRect.left, This->lockedRect.top, 1);
checkGLcall("glRasterPos3i");
- /* Some drivers(radeon dri, others?) don't like exceptions during
- * glDrawPixels. If the surface is a DIB section, it might be in GDIMode
- * after ReleaseDC. Reading it will cause an exception, which x11drv will
- * catch to put the dib section in InSync mode, which leads to a crash
- * and a blocked x server on my radeon card.
- *
- * The following lines read the dib section so it is put in InSync mode
- * before glDrawPixels is called and the crash is prevented. There won't
- * be any interfering gdi accesses, because UnlockRect is called from
- * ReleaseDC, and the app won't use the dc any more afterwards.
- */
- if((This->Flags & SFLAG_DIBSECTION) && !(This->Flags & SFLAG_PBO)) {
- volatile BYTE read;
- read = This->resource.allocatedMemory[0];
- }
-
if(This->Flags & SFLAG_PBO) {
GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, This->pbo));
checkGLcall("glBindBufferARB");
--
1.6.6.2
More information about the wine-patches
mailing list