ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Henri Verbeet 2011-08-25 21:04:57 +02:00 committed by Alexandre Julliard
parent 68a5305dfd
commit eac640532d
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/wined3d/surface.c
View File

@ -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])