From: Brian Paul <brianp@vmware.com>
Date: Thu, 12 Sep 2013 19:57:42 +0000 (-0600)
Subject: r300g: rename r300_bind_sampler_states to r300_bind_fragment_sampler_states
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9b99451da2451c0e6d8eeb118ef3284603f58f08;p=mesa.git

r300g: rename r300_bind_sampler_states to r300_bind_fragment_sampler_states
---

diff --git a/src/gallium/drivers/r300/r300_state.c b/src/gallium/drivers/r300/r300_state.c
index e69a605097d..249ee8beed4 100644
--- a/src/gallium/drivers/r300/r300_state.c
+++ b/src/gallium/drivers/r300/r300_state.c
@@ -1522,9 +1522,9 @@ static void*
     return (void*)sampler;
 }
 
-static void r300_bind_sampler_states(struct pipe_context* pipe,
-                                     unsigned count,
-                                     void** states)
+static void r300_bind_fragment_sampler_states(struct pipe_context* pipe,
+                                              unsigned count,
+                                              void** states)
 {
     struct r300_context* r300 = r300_context(pipe);
     struct r300_textures_state* state =
@@ -2157,7 +2157,7 @@ void r300_init_state_functions(struct r300_context* r300)
     r300->context.delete_rasterizer_state = r300_delete_rs_state;
 
     r300->context.create_sampler_state = r300_create_sampler_state;
-    r300->context.bind_fragment_sampler_states = r300_bind_sampler_states;
+    r300->context.bind_fragment_sampler_states = r300_bind_fragment_sampler_states;
     r300->context.bind_vertex_sampler_states = r300_lacks_vertex_textures;
     r300->context.delete_sampler_state = r300_delete_sampler_state;