Mesa (gallium-sampler-view): nvfx: fix up after merge

[Keith Whitwell]

Module: Mesa
Branch: gallium-sampler-view
Commit: 08189e639195ecb619ed37250b6dbb63017584b8
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=08189e639195ecb619ed37250b6dbb63017584b8

Author: Keith Whitwell <keithw at vmware.com>
Date:   Mon Mar 15 10:27:25 2010 +0000

nvfx: fix up after merge

---

 src/gallium/drivers/nvfx/nvfx_state.c |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/gallium/drivers/nvfx/nvfx_state.c b/src/gallium/drivers/nvfx/nvfx_state.c
index 32a8199..ecaa0dc 100644
--- a/src/gallium/drivers/nvfx/nvfx_state.c
+++ b/src/gallium/drivers/nvfx/nvfx_state.c
@@ -145,18 +145,14 @@ nvfx_set_fragment_sampler_views(struct pipe_context *pipe,
 	unsigned unit;
 
 	for (unit = 0; unit < nr; unit++) {
-		pipe_sampler_view_reference(&nv30->fragment_sampler_views[unit],
+		pipe_sampler_view_reference(&nvfx->fragment_sampler_views[unit],
                                             views[unit]);
-		pipe_texture_reference((struct pipe_texture **)
-				       &nvfx->tex_miptree[unit], miptree[unit]);
 		nvfx->dirty_samplers |= (1 << unit);
 	}
 
 	for (unit = nr; unit < nvfx->nr_textures; unit++) {
-		pipe_sampler_view_reference(&nv30->fragment_sampler_views[unit],
+		pipe_sampler_view_reference(&nvfx->fragment_sampler_views[unit],
                                             NULL);
-		pipe_texture_reference((struct pipe_texture **)
-				       &nvfx->tex_miptree[unit], NULL);
 		nvfx->dirty_samplers |= (1 << unit);
 	}
 
@@ -166,7 +162,7 @@ nvfx_set_fragment_sampler_views(struct pipe_context *pipe,
 
 
 static struct pipe_sampler_view *
-nv30_create_sampler_view(struct pipe_context *pipe,
+nvfx_create_sampler_view(struct pipe_context *pipe,
 			 struct pipe_texture *texture,
 			 const struct pipe_sampler_view *templ)
 {
@@ -185,7 +181,7 @@ nv30_create_sampler_view(struct pipe_context *pipe,
 
 
 static void
-nv30_sampler_view_destroy(struct pipe_context *pipe,
+nvfx_sampler_view_destroy(struct pipe_context *pipe,
 			  struct pipe_sampler_view *view)
 {
 	pipe_texture_reference(&view->texture, NULL);
@@ -614,7 +610,9 @@ nvfx_init_state_functions(struct nvfx_context *nvfx)
 	nvfx->pipe.create_sampler_state = nvfx_sampler_state_create;
 	nvfx->pipe.bind_fragment_sampler_states = nvfx_sampler_state_bind;
 	nvfx->pipe.delete_sampler_state = nvfx_sampler_state_delete;
-	nvfx->pipe.set_fragment_sampler_textures = nvfx_set_sampler_texture;
+	nvfx->pipe.set_fragment_sampler_views = nvfx_set_fragment_sampler_views;
+        nvfx->pipe.create_sampler_view = nvfx_create_sampler_view;
+        nvfx->pipe.sampler_view_destroy = nvfx_sampler_view_destroy;
 
 	nvfx->pipe.create_rasterizer_state = nvfx_rasterizer_state_create;
 	nvfx->pipe.bind_rasterizer_state = nvfx_rasterizer_state_bind;