Merge remote-tracking branch 'origin/master' into pipe-video

[mesa.git] / src / gallium / auxiliary / util / u_resource.c

diff --git a/src/gallium/auxiliary/util/u_resource.c b/src/gallium/auxiliary/util/u_resource.c
index 9e6474b83de6f7a121204f86e995a9d1e00ccb76..50a7cd4d55b0b9356c99cfdf8ebd4d73ad7121e3 100644 (file)
--- a/src/gallium/auxiliary/util/u_resource.c
+++ b/src/gallium/auxiliary/util/u_resource.c
@@ -10,85 +10,77 @@ u_resource( struct pipe_resource *res )
 }
 
 boolean u_resource_get_handle_vtbl(struct pipe_screen *screen,
-                         struct pipe_resource *resource,
-                         struct winsys_handle *handle)
+                                   struct pipe_resource *resource,
+                                   struct winsys_handle *handle)
 {
    struct u_resource *ur = u_resource(resource);
    return ur->vtbl->resource_get_handle(screen, resource, handle);
 }
 
 void u_resource_destroy_vtbl(struct pipe_screen *screen,
-                   struct pipe_resource *resource)
+                             struct pipe_resource *resource)
 {
    struct u_resource *ur = u_resource(resource);
    ur->vtbl->resource_destroy(screen, resource);
 }
 
-unsigned u_is_resource_referenced_vtbl( struct pipe_context *pipe,
-                                       struct pipe_resource *resource,
-                                       unsigned face, unsigned level)
-{
-   struct u_resource *ur = u_resource(resource);
-   return ur->vtbl->is_resource_referenced(pipe, resource, face, level);
-}
-
 struct pipe_transfer *u_get_transfer_vtbl(struct pipe_context *context,
-                                         struct pipe_resource *resource,
-                                         struct pipe_subresource sr,
-                                         enum pipe_transfer_usage usage,
-                                         const struct pipe_box *box)
+                                          struct pipe_resource *resource,
+                                          unsigned level,
+                                          unsigned usage,
+                                          const struct pipe_box *box)
 {
    struct u_resource *ur = u_resource(resource);
-   return ur->vtbl->get_transfer(context, resource, sr, usage, box);
+   return ur->vtbl->get_transfer(context, resource, level, usage, box);
 }
 
 void u_transfer_destroy_vtbl(struct pipe_context *pipe,
-                            struct pipe_transfer *transfer)
+                             struct pipe_transfer *transfer)
 {
    struct u_resource *ur = u_resource(transfer->resource);
    ur->vtbl->transfer_destroy(pipe, transfer);
 }
 
 void *u_transfer_map_vtbl( struct pipe_context *pipe,
-                          struct pipe_transfer *transfer )
+                           struct pipe_transfer *transfer )
 {
    struct u_resource *ur = u_resource(transfer->resource);
    return ur->vtbl->transfer_map(pipe, transfer);
 }
 
 void u_transfer_flush_region_vtbl( struct pipe_context *pipe,
-                                  struct pipe_transfer *transfer,
-                                  const struct pipe_box *box)
+                                   struct pipe_transfer *transfer,
+                                   const struct pipe_box *box)
 {
    struct u_resource *ur = u_resource(transfer->resource);
    ur->vtbl->transfer_flush_region(pipe, transfer, box);
 }
 
 void u_transfer_unmap_vtbl( struct pipe_context *pipe,
-                           struct pipe_transfer *transfer )
+                            struct pipe_transfer *transfer )
 {
    struct u_resource *ur = u_resource(transfer->resource);
    ur->vtbl->transfer_unmap(pipe, transfer);
 }
 
 void u_transfer_inline_write_vtbl( struct pipe_context *pipe,
-                                  struct pipe_resource *resource,
-                                  struct pipe_subresource sr,
-                                  unsigned usage,
-                                  const struct pipe_box *box,
-                                  const void *data,
-                                  unsigned stride,
-                                  unsigned slice_stride)
+                                   struct pipe_resource *resource,
+                                   unsigned level,
+                                   unsigned usage,
+                                   const struct pipe_box *box,
+                                   const void *data,
+                                   unsigned stride,
+                                   unsigned layer_stride)
 {
    struct u_resource *ur = u_resource(resource);
-   ur->vtbl->transfer_inline_write(pipe, 
-                                  resource,
-                                  sr,
-                                  usage,
-                                  box,
-                                  data,
-                                  stride,
-                                  slice_stride);
+   ur->vtbl->transfer_inline_write(pipe,
+                                   resource,
+                                   level,
+                                   usage,
+                                   box,
+                                   data,
+                                   stride,
+                                   layer_stride);
 }