Henri Verbeet : wined3d: Store render target attachments as IWineD3DSurfaceImpl pointers in struct fbo_entry .

[Alexandre Julliard]

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

Author: Henri Verbeet 
Date:   Thu Apr 15 19:21:27 2010 +0200

wined3d: Store render target attachments as IWineD3DSurfaceImpl pointers in struct fbo_entry.

---

dlls/wined3d/context.c         |    6 +++---
 dlls/wined3d/wined3d_private.h |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index 43a6d8a..d7f6b40 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -300,7 +300,7 @@ static void context_check_fbo_status(struct wined3d_context *context)
         /* Dump the FBO attachments */
         for (i = 0; i < gl_info->limits.buffers; ++i)
         {
-            attachment = (IWineD3DSurfaceImpl *)context->current_fbo->render_targets[i];
+            attachment = context->current_fbo->render_targets[i];
             if (attachment)
             {
                 FIXME("\tColor attachment %d: (%p) %s %ux%u\n",
@@ -638,7 +638,7 @@ void context_resource_released(IWineD3DDevice *iface, IWineD3DResource *resource

for (j = 0; j < gl_info->limits.buffers; ++j)
                     {
-                        if (entry->render_targets[j] == (IWineD3DSurface *)resource)
+                        if (entry->render_targets[j] == (IWineD3DSurfaceImpl *)resource)
                         {
                             list_remove(&entry->entry);
                             list_add_head(&context->fbo_destroy_list, &entry->entry);
@@ -666,7 +666,7 @@ void context_surface_update(struct wined3d_context *context, IWineD3DSurfaceImpl

for (i = 0; i < gl_info->limits.buffers; ++i)
     {
-        if (surface == (IWineD3DSurfaceImpl *)entry->render_targets[i])
+        if (surface == entry->render_targets[i])
         {
             TRACE("Updated surface %p is bound as color attachment %u to the current FBO.\n", surface, i);
             context->rebind_fbo = TRUE;
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 95445a1..2a6e3ee 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -2022,7 +2022,7 @@ typedef struct {
 struct fbo_entry
 {
     struct list entry;
-    IWineD3DSurface **render_targets;
+    IWineD3DSurfaceImpl **render_targets;
     IWineD3DSurface *depth_stencil;
     BOOL attached;
     GLuint id;