Skip to content

W
wine-winehq
Commit eac64053 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard
Browse files
Options

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

parent 68a5305d
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 14 deletions
dlls/wined3d/surface.c
View file @ eac64053
...@@ -5793,20 +5793,9 @@ void surface_modify_location(struct wined3d_surface *surface, DWORD location, BO ...@@ -5793,20 +5793,9 @@ void surface_modify_location(struct wined3d_surface *surface, DWORD location, BO
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);
if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && surface_is_offscreen(surface)
{ && (location & SFLAG_INDRAWABLE))
if (surface_is_offscreen(surface)) ERR("Trying to invalidate the SFLAG_INDRAWABLE location of an offscreen surface.\n");
{
/* 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 (location & (SFLAG_INTEXTURE | SFLAG_INSRGBTEX) if (location & (SFLAG_INTEXTURE | SFLAG_INSRGBTEX)
&& gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) && gl_info->supported[EXT_TEXTURE_SRGB_DECODE])
......
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