Henri Verbeet : wined3d: Get rid of the renderbuffer_entry_t typedef.

[Alexandre Julliard]

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

Author: Henri Verbeet 
Date:   Mon May 16 23:01:24 2011 +0200

wined3d: Get rid of the renderbuffer_entry_t typedef.

---

dlls/wined3d/surface.c         |   14 +++++++-------
 dlls/wined3d/wined3d_private.h |    7 ++++---
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 520a4ad..862ba07 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -48,8 +48,8 @@ static void surface_cleanup(struct wined3d_surface *surface)

if (surface->texture_name || (surface->flags & SFLAG_PBO) || !list_empty(&surface->renderbuffers))
     {
+        struct wined3d_renderbuffer_entry *entry, *entry2;
         const struct wined3d_gl_info *gl_info;
-        renderbuffer_entry_t *entry, *entry2;
         struct wined3d_context *context;

context = context_acquire(surface->resource.device, NULL);
@@ -69,7 +69,7 @@ static void surface_cleanup(struct wined3d_surface *surface)
             GL_EXTCALL(glDeleteBuffersARB(1, &surface->pbo));
         }

-        LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &surface->renderbuffers, renderbuffer_entry_t, entry)
+        LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &surface->renderbuffers, struct wined3d_renderbuffer_entry, entry)
         {
             TRACE("Deleting renderbuffer %u.\n", entry->id);
             gl_info->fbo_ops.glDeleteRenderbuffers(1, &entry->id);
@@ -1529,9 +1529,9 @@ static void surface_remove_pbo(struct wined3d_surface *surface, const struct win
 static void surface_unload(struct wined3d_resource *resource)
 {
     struct wined3d_surface *surface = surface_from_resource(resource);
+    struct wined3d_renderbuffer_entry *entry, *entry2;
     struct wined3d_device *device = resource->device;
     const struct wined3d_gl_info *gl_info;
-    renderbuffer_entry_t *entry, *entry2;
     struct wined3d_context *context;

TRACE("surface %p.\n", surface);
@@ -1571,7 +1571,7 @@ static void surface_unload(struct wined3d_resource *resource)
      * all application-created targets the application has to release the surface
      * before calling _Reset
      */
-    LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &surface->renderbuffers, renderbuffer_entry_t, entry)
+    LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &surface->renderbuffers, struct wined3d_renderbuffer_entry, entry)
     {
         ENTER_GL();
         gl_info->fbo_ops.glDeleteRenderbuffers(1, &entry->id);
@@ -2325,7 +2325,7 @@ static void surface_allocate_surface(struct wined3d_surface *surface, const stru
 void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, struct wined3d_surface *rt)
 {
     const struct wined3d_gl_info *gl_info = &surface->resource.device->adapter->gl_info;
-    renderbuffer_entry_t *entry;
+    struct wined3d_renderbuffer_entry *entry;
     GLuint renderbuffer = 0;
     unsigned int src_width, src_height;
     unsigned int width, height;
@@ -2356,7 +2356,7 @@ void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, struct
     }

/* Look if we've already got a renderbuffer of the correct dimensions */
-    LIST_FOR_EACH_ENTRY(entry, &surface->renderbuffers, renderbuffer_entry_t, entry)
+    LIST_FOR_EACH_ENTRY(entry, &surface->renderbuffers, struct wined3d_renderbuffer_entry, entry)
     {
         if (entry->width == width && entry->height == height)
         {
@@ -2373,7 +2373,7 @@ void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, struct
         gl_info->fbo_ops.glRenderbufferStorage(GL_RENDERBUFFER,
                 surface->resource.format->glInternal, width, height);

-        entry = HeapAlloc(GetProcessHeap(), 0, sizeof(renderbuffer_entry_t));
+        entry = HeapAlloc(GetProcessHeap(), 0, sizeof(*entry));
         entry->width = width;
         entry->height = height;
         entry->id = renderbuffer;
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 2bb91d1..5973f0a 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1964,12 +1964,13 @@ typedef struct wineD3DSurface_DIB {
     BOOL client_memory;
 } wineD3DSurface_DIB;

-typedef struct {
+struct wined3d_renderbuffer_entry
+{
     struct list entry;
     GLuint id;
     UINT width;
     UINT height;
-} renderbuffer_entry_t;
+};

struct fbo_entry
 {
@@ -2068,7 +2069,7 @@ struct wined3d_surface
     WINEDDCOLORKEY            glCKey;

struct list               renderbuffers;
-    renderbuffer_entry_t      *current_renderbuffer;
+    struct wined3d_renderbuffer_entry *current_renderbuffer;
     SIZE ds_current_size;

/* DirectDraw clippers */