Commit c6ce5486 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard

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.
parent ae2ce18f
...@@ -5361,8 +5361,6 @@ static void surface_invalidate_location(struct wined3d_surface *surface, DWORD l ...@@ -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) 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", TRACE("surface %p, location %s, persistent %#x.\n",
surface, debug_surflocation(location), persistent); surface, debug_surflocation(location), persistent);
...@@ -5371,10 +5369,6 @@ void surface_modify_location(struct wined3d_surface *surface, DWORD location, BO ...@@ -5371,10 +5369,6 @@ void surface_modify_location(struct wined3d_surface *surface, DWORD location, BO
&& (location & SFLAG_INDRAWABLE)) && (location & SFLAG_INDRAWABLE))
ERR("Trying to invalidate the SFLAG_INDRAWABLE location of an offscreen surface.\n"); 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) if (persistent)
{ {
surface_validate_location(surface, location); surface_validate_location(surface, location);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment