wined3d: Get rid of the special SFLAG_INTEXTURE / SFLAG_INSRGBTEX code in…

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.

wined3d: Get rid of the special SFLAG_INTEXTURE / SFLAG_INSRGBTEX code in…
c6ce5486 · Henri Verbeet · Alexandre Julliard · ae2ce18f · c6ce5486
Commit c6ce5486 authored Sep 10, 2013 by Henri Verbeet Committed by Alexandre Julliard Sep 10, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

surface.c dlls/wined3d/surface.c +0 -6

No files found.
--- 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);