Henri Verbeet : wined3d: Get rid of the special SFLAG_INTEXTURE / SFLAG_INSRGBTEX code in surface_modify_location().

[Alexandre Julliard]

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

Author: Henri Verbeet 
Date:   Tue Sep 10 09:32:32 2013 +0200

wined3d: Get rid of the special SFLAG_INTEXTURE / SFLAG_INSRGBTEX code in surface_modify_location().

It turns out this is already safe for all callers.

---

dlls/wined3d/surface.c |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 385a994..ee404c1 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -5361,8 +5361,6 @@ static void surface_invalidate_location(struct wined3d_surface *surface, DWORD l

void surface_modify_location(struct wined3d_surface *surface, DWORD location, BOOL persistent)
 {
-    const struct wined3d_gl_info *gl_info = &surface->resource.device->adapter->gl_info;
-
     TRACE("surface %p, location %s, persistent %#x.\n",
             surface, debug_surflocation(location), persistent);

@@ -5371,10 +5369,6 @@ void surface_modify_location(struct wined3d_surface *surface, DWORD location, BO
             && (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])
-        location |= (SFLAG_INTEXTURE | SFLAG_INSRGBTEX);
-
     if (persistent)
     {
         surface_validate_location(surface, location);