Henri Verbeet : wined3d: Get rid of the location fixup for ORM_FBO in surface_modify_location().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: eac640532da26841b1ac41d01823c00270cc6376
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=eac640532da26841b1ac41d018...

Author: Henri Verbeet 
Date:   Thu Aug 25 21:04:57 2011 +0200

wined3d: Get rid of the location fixup for ORM_FBO in surface_modify_location().

---

dlls/wined3d/surface.c |   17 +++--------------
 1 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index c880e6e..49dbc68 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -5793,20 +5793,9 @@ void surface_modify_location(struct wined3d_surface *surface, DWORD location, BO
     TRACE("surface %p, location %s, persistent %#x.\n",
             surface, debug_surflocation(location), persistent);

-    if (wined3d_settings.offscreen_rendering_mode == ORM_FBO)
-    {
-        if (surface_is_offscreen(surface))
-        {
-            /* With ORM_FBO, SFLAG_INTEXTURE and SFLAG_INDRAWABLE are the same
-             * for offscreen targets. */
-            if (location & (SFLAG_INTEXTURE | SFLAG_INDRAWABLE))
-                location |= (SFLAG_INTEXTURE | SFLAG_INDRAWABLE);
-        }
-        else
-        {
-            TRACE("Surface %p is an onscreen surface.\n", surface);
-        }
-    }
+    if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && surface_is_offscreen(surface)
+            && (location & SFLAG_INDRAWABLE))
+        ERR("Trying to invalidate the SFLAG_INDRAWABLE location of an offscreen surface.\n");

if (location & (SFLAG_INTEXTURE | SFLAG_INSRGBTEX)
             && gl_info->supported[EXT_TEXTURE_SRGB_DECODE])