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

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

This commit is contained in:
Henri Verbeet 2010-04-15 19:21:27 +02:00 committed by Alexandre Julliard
parent 24c93d48aa
commit be993fc49f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/wined3d/context.c
View File

@ -300,7 +300,7 @@ static void context_check_fbo_status(struct wined3d_context *context)
/* Dump the FBO attachments */ /* Dump the FBO attachments */
for (i = 0; i < gl_info->limits.buffers; ++i) 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) if (attachment)
{ {
FIXME("\tColor attachment %d: (%p) %s %ux%u\n", 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) 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_remove(&entry->entry);
list_add_head(&context->fbo_destroy_list, &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) 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); TRACE("Updated surface %p is bound as color attachment %u to the current FBO.\n", surface, i);
context->rebind_fbo = TRUE; context->rebind_fbo = TRUE;

2
dlls/wined3d/wined3d_private.h
View File

@ -2022,7 +2022,7 @@ typedef struct {
struct fbo_entry struct fbo_entry
{ {
struct list entry; struct list entry;
IWineD3DSurface **render_targets; IWineD3DSurfaceImpl **render_targets;
IWineD3DSurface *depth_stencil; IWineD3DSurface *depth_stencil;
BOOL attached; BOOL attached;
GLuint id; GLuint id;