Squashed commit of the following:

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

diff --git a/src/gallium/auxiliary/util/u_sampler.c b/src/gallium/auxiliary/util/u_sampler.c
index 4d8f861ce49047f6d1123235241d49c486c5b03e..e77f562ea222a2cec01a2f38636d14acad873b3d 100644 (file)
--- a/src/gallium/auxiliary/util/u_sampler.c
+++ b/src/gallium/auxiliary/util/u_sampler.c
@@ -32,7 +32,7 @@
 
 static void
 default_template(struct pipe_sampler_view *view,
-                 const struct pipe_texture *texture,
+                 const struct pipe_resource *texture,
                  enum pipe_format format,
                  unsigned expand_green_blue)
 {
@@ -77,7 +77,7 @@ default_template(struct pipe_sampler_view *view,
 
 void
 u_sampler_view_default_template(struct pipe_sampler_view *view,
-                                const struct pipe_texture *texture,
+                                const struct pipe_resource *texture,
                                 enum pipe_format format)
 {
    /* Expand to (0, 0, 0, 1) */
@@ -89,7 +89,7 @@ u_sampler_view_default_template(struct pipe_sampler_view *view,
 
 void
 u_sampler_view_default_dx9_template(struct pipe_sampler_view *view,
-                                    const struct pipe_texture *texture,
+                                    const struct pipe_resource *texture,
                                     enum pipe_format format)
 {
    /* Expand to (1, 1, 1, 1) */