Module: wine Branch: master Commit: c114746f6f5601ec6c6a84b8a353868976509f5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c114746f6f5601ec6c6a84b8a...
Author: Józef Kucia jkucia@codeweavers.com Date: Thu Mar 8 16:55:25 2018 +0330
wined3d: Allow blits from drawable location when loading renderbuffer locations.
Fixes a regression introduced by fb6b3cc872077e641cf68165e04012a95c94699d.
Signed-off-by: Józef Kucia jkucia@codeweavers.com Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/wined3d/surface.c | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 35aee73..201a563 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2358,6 +2358,10 @@ BOOL texture2d_load_renderbuffer(struct wined3d_texture *texture, unsigned int s src_location = WINED3D_LOCATION_RB_RESOLVED; else if (locations & WINED3D_LOCATION_TEXTURE_SRGB) src_location = WINED3D_LOCATION_TEXTURE_SRGB; + else if (locations & WINED3D_LOCATION_TEXTURE_RGB) + src_location = WINED3D_LOCATION_TEXTURE_RGB; + else if (locations & WINED3D_LOCATION_DRAWABLE) + src_location = WINED3D_LOCATION_DRAWABLE; else /* texture2d_blt_fbo() will load the source location if necessary. */ src_location = WINED3D_LOCATION_TEXTURE_RGB;