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

wined3d: Remove isInDraw hack from context_setup_target. 

It is conceptually wrong and actually broken too (as the comment there
said). Just remove the hack now and properly fix any regression that
may come up later by explicitely acquiring the right context where
needed (so, in surface_internal_preload and its callees).
This commit is contained in:
Matteo Bruni 2010-08-07 22:37:11 +02:00 committed by Alexandre Julliard
parent c1450356a7
commit b6637eb89f
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/wined3d/context.c
View File

@ -2321,19 +2321,6 @@ static void context_setup_target(IWineD3DDeviceImpl *device,
if (wined3d_settings.offscreen_rendering_mode != ORM_FBO
&& old_render_offscreen && context->current_rt != target)
{
BOOL oldInDraw = device->isInDraw;
/* surface_internal_preload() requires a context to load the
* texture, so it will call context_acquire(). Set isInDraw to true
* to signal surface_internal_preload() that it has a context. */
/* FIXME: This is just broken. There's no guarantee whatsoever
* that the currently active context, if any, is appropriate for
* reading back the render target. We should probably call
* context_set_current(context) here and then rely on
* context_acquire() doing the right thing. */
device->isInDraw = TRUE;
/* Read the back buffer of the old drawable into the destination texture. */
if (context->current_rt->texture_name_srgb)
{
@ -2345,8 +2332,6 @@ static void context_setup_target(IWineD3DDeviceImpl *device,
}
surface_modify_location(context->current_rt, SFLAG_INDRAWABLE, FALSE);
device->isInDraw = oldInDraw;
}
}