From: Brian Paul <brianp@vmware.com>
Date: Mon, 13 Feb 2012 21:51:14 +0000 (-0700)
Subject: st/mesa: simplify st_create_texture_sampler_view()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9600b0762b8007f63e96f590e338ea0a8e89e095;p=mesa.git

st/mesa: simplify st_create_texture_sampler_view()

Implement in terms of st_create_texture_sampler_view_format().

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
---

diff --git a/src/mesa/state_tracker/st_texture.h b/src/mesa/state_tracker/st_texture.h
index b5c22ee370a..0b3e0be3cb4 100644
--- a/src/mesa/state_tracker/st_texture.h
+++ b/src/mesa/state_tracker/st_texture.h
@@ -122,18 +122,6 @@ st_get_stobj_resource(struct st_texture_object *stObj)
 }
 
 
-static INLINE struct pipe_sampler_view *
-st_create_texture_sampler_view(struct pipe_context *pipe,
-                               struct pipe_resource *texture)
-{
-   struct pipe_sampler_view templ;
-
-   u_sampler_view_default_template(&templ, texture, texture->format);
-
-   return pipe->create_sampler_view(pipe, texture, &templ);
-}
-
-
 static INLINE struct pipe_sampler_view *
 st_create_texture_sampler_view_format(struct pipe_context *pipe,
                                       struct pipe_resource *texture,
@@ -146,6 +134,15 @@ st_create_texture_sampler_view_format(struct pipe_context *pipe,
    return pipe->create_sampler_view(pipe, texture, &templ);
 }
 
+static INLINE struct pipe_sampler_view *
+st_create_texture_sampler_view(struct pipe_context *pipe,
+                               struct pipe_resource *texture)
+{
+   return st_create_texture_sampler_view_format(pipe, texture,
+                                                texture->format);
+}
+
+
 
 extern struct pipe_resource *
 st_texture_create(struct st_context *st,