From c6ce5486c00b637422ec78c2dfdd584205faf5a8 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Tue, 10 Sep 2013 09:32:32 +0200 Subject: [PATCH] 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 file changed, 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 385a994951f..ee404c1e47b 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);