=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: wined3d: Do not try to attach WINED3FMT_NULL surfaces to FBO.

Alexandre Julliard julliard at winehq.org
Mon Jun 6 10:19:52 CDT 2016


Module: wine
Branch: master
Commit: 9cc95e5a1d930d72892949a3ddf8fa00d471af88
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9cc95e5a1d930d72892949a3ddf8fa00d471af88

Author: Józef Kucia <jkucia at codeweavers.com>
Date:   Mon Jun  6 12:19:32 2016 +0200

wined3d: Do not try to attach WINED3FMT_NULL surfaces to FBO.

This fixes a regression introduced by commit
b76fcbe0da45329ff784b027457b4c14c691e215.

Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/wined3d/context.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index 845ca1d..389ae98 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -378,7 +378,7 @@ static inline void context_set_fbo_key_for_surface(const struct wined3d_context
         struct wined3d_fbo_entry_key *key, UINT idx, struct wined3d_surface *surface,
         DWORD location)
 {
-    if (!surface)
+    if (!surface || surface->container->resource.format->id == WINED3DFMT_NULL)
     {
         key->objects[idx].object = 0;
         key->objects[idx].target = 0;




More information about the wine-cvs mailing list