gallium: don't use arrays for texture width,height,depth

[mesa.git] / src / gallium / drivers / trace / tr_texture.c

diff --git a/src/gallium/drivers/trace/tr_texture.c b/src/gallium/drivers/trace/tr_texture.c
index 120ba0dd3179470dc230d117aab6dc4f782e6cf9..1f25fe38d4cc097dcb2acc226b7fca3d4a68737e 100644 (file)
--- a/src/gallium/drivers/trace/tr_texture.c
+++ b/src/gallium/drivers/trace/tr_texture.c
@@ -25,35 +25,39 @@
  *
  **************************************************************************/
 
-#include "pipe/p_inlines.h"
 #include "util/u_hash_table.h"
 #include "util/u_memory.h"
+#include "util/u_simple_list.h"
 
 #include "tr_screen.h"
 #include "tr_texture.h"
 
 
 struct pipe_texture *
-trace_texture_create(struct trace_screen *tr_scr, 
+trace_texture_create(struct trace_screen *tr_scr,
                      struct pipe_texture *texture)
 {
    struct trace_texture *tr_tex;
-   
+
    if(!texture)
       goto error;
-   
+
    assert(texture->screen == tr_scr->screen);
-   
+
    tr_tex = CALLOC_STRUCT(trace_texture);
    if(!tr_tex)
       goto error;
-   
+
    memcpy(&tr_tex->base, texture, sizeof(struct pipe_texture));
+
+   pipe_reference_init(&tr_tex->base.reference, 1);
    tr_tex->base.screen = &tr_scr->base;
    tr_tex->texture = texture;
-   
+
+   trace_screen_add_to_list(tr_scr, textures, tr_tex);
+
    return &tr_tex->base;
-   
+
 error:
    pipe_texture_reference(&texture, NULL);
    return NULL;
@@ -61,38 +65,44 @@ error:
 
 
 void
-trace_texture_destroy(struct trace_screen *tr_scr, 
-                      struct pipe_texture *texture)
+trace_texture_destroy(struct trace_texture *tr_tex)
 {
-   struct trace_texture *tr_tex = trace_texture(tr_scr, texture); 
+   struct trace_screen *tr_scr = trace_screen(tr_tex->base.screen);
+
+   trace_screen_remove_from_list(tr_scr, textures, tr_tex);
+
    pipe_texture_reference(&tr_tex->texture, NULL);
    FREE(tr_tex);
 }
 
 
 struct pipe_surface *
-trace_surface_create(struct trace_texture *tr_tex, 
+trace_surface_create(struct trace_texture *tr_tex,
                      struct pipe_surface *surface)
 {
+   struct trace_screen *tr_scr = trace_screen(tr_tex->base.screen);
    struct trace_surface *tr_surf;
-   
+
    if(!surface)
       goto error;
-   
+
    assert(surface->texture == tr_tex->texture);
-   
+
    tr_surf = CALLOC_STRUCT(trace_surface);
    if(!tr_surf)
       goto error;
-   
+
    memcpy(&tr_surf->base, surface, sizeof(struct pipe_surface));
-   
+
+   pipe_reference_init(&tr_surf->base.reference, 1);
    tr_surf->base.texture = NULL;
    pipe_texture_reference(&tr_surf->base.texture, &tr_tex->base);
    tr_surf->surface = surface;
 
+   trace_screen_add_to_list(tr_scr, surfaces, tr_surf);
+
    return &tr_surf->base;
-   
+
 error:
    pipe_surface_reference(&surface, NULL);
    return NULL;
@@ -100,10 +110,12 @@ error:
 
 
 void
-trace_surface_destroy(struct trace_texture *tr_tex, 
-                      struct pipe_surface *surface)
+trace_surface_destroy(struct trace_surface *tr_surf)
 {
-   struct trace_surface *tr_surf = trace_surface(tr_tex, surface);
+   struct trace_screen *tr_scr = trace_screen(tr_surf->base.texture->screen);
+
+   trace_screen_remove_from_list(tr_scr, surfaces, tr_surf);
+
    pipe_texture_reference(&tr_surf->base.texture, NULL);
    pipe_surface_reference(&tr_surf->surface, NULL);
    FREE(tr_surf);
@@ -111,41 +123,48 @@ trace_surface_destroy(struct trace_texture *tr_tex,
 
 
 struct pipe_transfer *
-trace_transfer_create(struct trace_texture *tr_tex, 
+trace_transfer_create(struct trace_texture *tr_tex,
                      struct pipe_transfer *transfer)
 {
+   struct trace_screen *tr_scr = trace_screen(tr_tex->base.screen);
    struct trace_transfer *tr_trans;
-   
+
    if(!transfer)
       goto error;
-   
+
    assert(transfer->texture == tr_tex->texture);
-   
+
    tr_trans = CALLOC_STRUCT(trace_transfer);
    if(!tr_trans)
       goto error;
-   
+
    memcpy(&tr_trans->base, transfer, sizeof(struct pipe_transfer));
-   
+
    tr_trans->base.texture = NULL;
    pipe_texture_reference(&tr_trans->base.texture, &tr_tex->base);
    tr_trans->transfer = transfer;
+   assert(tr_trans->base.texture == &tr_tex->base);
+
+   trace_screen_add_to_list(tr_scr, transfers, tr_trans);
 
    return &tr_trans->base;
-   
+
 error:
-   pipe_transfer_reference(&transfer, NULL);
+   transfer->texture->screen->tex_transfer_destroy(transfer);
    return NULL;
 }
 
 
 void
-trace_transfer_destroy(struct trace_texture *tr_tex, 
-                      struct pipe_transfer *transfer)
+trace_transfer_destroy(struct trace_transfer *tr_trans)
 {
-   struct trace_transfer *tr_trans = trace_transfer(tr_tex, transfer);
+   struct trace_screen *tr_scr = trace_screen(tr_trans->base.texture->screen);
+   struct pipe_screen *screen = tr_trans->transfer->texture->screen;
+
+   trace_screen_remove_from_list(tr_scr, transfers, tr_trans);
+
    pipe_texture_reference(&tr_trans->base.texture, NULL);
-   pipe_transfer_reference(&tr_trans->transfer, NULL);
+   screen->tex_transfer_destroy(tr_trans->transfer);
    FREE(tr_trans);
 }