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

wined3d: Get rid of lastActiveRenderTarget in FindContext().

This commit is contained in:
Henri Verbeet 2009-07-21 11:51:10 +02:00 committed by Alexandre Julliard
parent 8402519c7a
commit 223b9d5c01
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/wined3d/context.c
View File

@ -1667,7 +1667,8 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf
* After that, the outer ActivateContext(which calls PreLoad) can activate the new * After that, the outer ActivateContext(which calls PreLoad) can activate the new
* target for the new thread * target for the new thread
*/ */
if (readTexture && This->lastActiveRenderTarget != target) { if (readTexture && context->current_rt != target)
{
BOOL oldInDraw = This->isInDraw; BOOL oldInDraw = This->isInDraw;
/* PreLoad requires a context to load the texture, thus it will call ActivateContext. /* PreLoad requires a context to load the texture, thus it will call ActivateContext.
@ -1679,15 +1680,15 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf
/* Do that before switching the context: /* Do that before switching the context:
* Read the back buffer of the old drawable into the destination texture * Read the back buffer of the old drawable into the destination texture
*/ */
if (((IWineD3DSurfaceImpl *)This->lastActiveRenderTarget)->texture_name_srgb) if (((IWineD3DSurfaceImpl *)context->current_rt)->texture_name_srgb)
{ {
surface_internal_preload(This->lastActiveRenderTarget, SRGB_BOTH); surface_internal_preload(context->current_rt, SRGB_BOTH);
} else { } else {
surface_internal_preload(This->lastActiveRenderTarget, SRGB_RGB); surface_internal_preload(context->current_rt, SRGB_RGB);
} }
/* Assume that the drawable will be modified by some other things now */ /* Assume that the drawable will be modified by some other things now */
IWineD3DSurface_ModifyLocation(This->lastActiveRenderTarget, SFLAG_INDRAWABLE, FALSE); IWineD3DSurface_ModifyLocation(context->current_rt, SFLAG_INDRAWABLE, FALSE);
This->isInDraw = oldInDraw; This->isInDraw = oldInDraw;
} }