From: Jakob Bornecrantz <jakob@vmware.com>
Date: Sat, 1 May 2010 11:02:26 +0000 (+0100)
Subject: identity: s/texture/resource/
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=59b160d286e5848851848e09c87eb64cd2631c6b;p=mesa.git

identity: s/texture/resource/
---

diff --git a/src/gallium/drivers/identity/id_context.c b/src/gallium/drivers/identity/id_context.c
index 6e88239d654..90a669d5189 100644
--- a/src/gallium/drivers/identity/id_context.c
+++ b/src/gallium/drivers/identity/id_context.c
@@ -691,33 +691,33 @@ identity_is_resource_referenced(struct pipe_context *_pipe,
    struct identity_context *id_pipe = identity_context(_pipe);
    struct identity_resource *id_resource = identity_resource(_resource);
    struct pipe_context *pipe = id_pipe->pipe;
-   struct pipe_resource *texture = id_resource->resource;
+   struct pipe_resource *resource = id_resource->resource;
 
    return pipe->is_resource_referenced(pipe,
-                                       texture,
+                                       resource,
                                        face,
                                        level);
 }
 
 static struct pipe_sampler_view *
 identity_create_sampler_view(struct pipe_context *pipe,
-                             struct pipe_resource *texture,
+                             struct pipe_resource *resource,
                              const struct pipe_sampler_view *templ)
 {
    struct identity_context *id_pipe = identity_context(pipe);
-   struct identity_resource *id_resource = identity_resource(texture);
+   struct identity_resource *id_resource = identity_resource(resource);
    struct pipe_context *pipe_unwrapped = id_pipe->pipe;
-   struct pipe_resource *texture_unwrapped = id_resource->resource;
+   struct pipe_resource *resource_unwrapped = id_resource->resource;
    struct identity_sampler_view *view = MALLOC(sizeof(struct identity_sampler_view));
 
    view->sampler_view = pipe_unwrapped->create_sampler_view(pipe_unwrapped,
-                                                            texture_unwrapped,
+                                                            resource_unwrapped,
                                                             templ);
 
    view->base = *templ;
    view->base.reference.count = 1;
    view->base.texture = NULL;
-   pipe_resource_reference(&view->base.texture, texture);
+   pipe_resource_reference(&view->base.texture, resource);
    view->base.context = pipe;
 
    return &view->base;
@@ -749,11 +749,11 @@ identity_context_get_transfer(struct pipe_context *_context,
    struct identity_context *id_context = identity_context(_context);
    struct identity_resource *id_resource = identity_resource(_resource);
    struct pipe_context *context = id_context->pipe;
-   struct pipe_resource *texture = id_resource->resource;
+   struct pipe_resource *resource = id_resource->resource;
    struct pipe_transfer *result;
 
    result = context->get_transfer(context,
-                                  texture,
+                                  resource,
                                   sr,
                                   usage,
                                   box);
@@ -829,10 +829,10 @@ identity_context_transfer_inline_write(struct pipe_context *_context,
    struct identity_context *id_context = identity_context(_context);
    struct identity_resource *id_resource = identity_resource(_resource);
    struct pipe_context *context = id_context->pipe;
-   struct pipe_resource *texture = id_resource->resource;
+   struct pipe_resource *resource = id_resource->resource;
 
    context->transfer_inline_write(context,
-                                  texture,
+                                  resource,
                                   sr,
                                   usage,
                                   box,
diff --git a/src/gallium/drivers/identity/id_screen.c b/src/gallium/drivers/identity/id_screen.c
index 4fddd62ac2c..7671bded981 100644
--- a/src/gallium/drivers/identity/id_screen.c
+++ b/src/gallium/drivers/identity/id_screen.c
@@ -154,44 +154,44 @@ identity_screen_resource_from_handle(struct pipe_screen *_screen,
 
 static boolean
 identity_screen_resource_get_handle(struct pipe_screen *_screen,
-                                    struct pipe_resource *_texture,
+                                    struct pipe_resource *_resource,
                                     struct winsys_handle *handle)
 {
    struct identity_screen *id_screen = identity_screen(_screen);
-   struct identity_resource *id_resource = identity_resource(_texture);
+   struct identity_resource *id_resource = identity_resource(_resource);
    struct pipe_screen *screen = id_screen->screen;
-   struct pipe_resource *texture = id_resource->resource;
+   struct pipe_resource *resource = id_resource->resource;
 
    /* TODO trace call */
 
-   return screen->resource_get_handle(screen, texture, handle);
+   return screen->resource_get_handle(screen, resource, handle);
 }
 
 
 
 static void
 identity_screen_resource_destroy(struct pipe_screen *screen,
-                                 struct pipe_resource *_texture)
+                                 struct pipe_resource *_resource)
 {
-   identity_resource_destroy(identity_resource(_texture));
+   identity_resource_destroy(identity_resource(_resource));
 }
 
 static struct pipe_surface *
 identity_screen_get_tex_surface(struct pipe_screen *_screen,
-                                struct pipe_resource *_texture,
+                                struct pipe_resource *_resource,
                                 unsigned face,
                                 unsigned level,
                                 unsigned zslice,
                                 unsigned usage)
 {
    struct identity_screen *id_screen = identity_screen(_screen);
-   struct identity_resource *id_resource = identity_resource(_texture);
+   struct identity_resource *id_resource = identity_resource(_resource);
    struct pipe_screen *screen = id_screen->screen;
-   struct pipe_resource *texture = id_resource->resource;
+   struct pipe_resource *resource = id_resource->resource;
    struct pipe_surface *result;
 
    result = screen->get_tex_surface(screen,
-                                    texture,
+                                    resource,
                                     face,
                                     level,
                                     zslice,