nv: Update for renamed sampler/texture state setters.

diff --git a/src/gallium/drivers/nv04/nv04_state.c b/src/gallium/drivers/nv04/nv04_state.c
index d356ebd8b3688217740b49d490b644342f3253e3..ef3005db5fc11e261f83dd25ee356dda8cabcd1f 100644 (file)
--- a/src/gallium/drivers/nv04/nv04_state.c
+++ b/src/gallium/drivers/nv04/nv04_state.c
@@ -425,9 +425,9 @@ nv04_init_state_functions(struct nv04_context *nv04)
        nv04->pipe.delete_blend_state = nv04_blend_state_delete;
 
        nv04->pipe.create_sampler_state = nv04_sampler_state_create;
-       nv04->pipe.bind_sampler_states = nv04_sampler_state_bind;
+       nv04->pipe.bind_fragment_sampler_states = nv04_sampler_state_bind;
        nv04->pipe.delete_sampler_state = nv04_sampler_state_delete;
-       nv04->pipe.set_sampler_textures = nv04_set_sampler_texture;
+       nv04->pipe.set_fragment_sampler_textures = nv04_set_sampler_texture;
 
        nv04->pipe.create_rasterizer_state = nv04_rasterizer_state_create;
        nv04->pipe.bind_rasterizer_state = nv04_rasterizer_state_bind;

diff --git a/src/gallium/drivers/nv10/nv10_state.c b/src/gallium/drivers/nv10/nv10_state.c
index 9b38219b996d70cbc1d607c11e35586b8fe6db1f..ffc6be3c401d68740f162bb86d15ab001d4d2299 100644 (file)
--- a/src/gallium/drivers/nv10/nv10_state.c
+++ b/src/gallium/drivers/nv10/nv10_state.c
@@ -553,9 +553,9 @@ nv10_init_state_functions(struct nv10_context *nv10)
        nv10->pipe.delete_blend_state = nv10_blend_state_delete;
 
        nv10->pipe.create_sampler_state = nv10_sampler_state_create;
-       nv10->pipe.bind_sampler_states = nv10_sampler_state_bind;
+       nv10->pipe.bind_fragment_sampler_states = nv10_sampler_state_bind;
        nv10->pipe.delete_sampler_state = nv10_sampler_state_delete;
-       nv10->pipe.set_sampler_textures = nv10_set_sampler_texture;
+       nv10->pipe.set_fragment_sampler_textures = nv10_set_sampler_texture;
 
        nv10->pipe.create_rasterizer_state = nv10_rasterizer_state_create;
        nv10->pipe.bind_rasterizer_state = nv10_rasterizer_state_bind;

diff --git a/src/gallium/drivers/nv20/nv20_state.c b/src/gallium/drivers/nv20/nv20_state.c
index ed4084980f20148af52ae8aec449511eff03d531..3a82e63423dcea9b595a573c25479f9af90c452b 100644 (file)
--- a/src/gallium/drivers/nv20/nv20_state.c
+++ b/src/gallium/drivers/nv20/nv20_state.c
@@ -546,9 +546,9 @@ nv20_init_state_functions(struct nv20_context *nv20)
        nv20->pipe.delete_blend_state = nv20_blend_state_delete;
 
        nv20->pipe.create_sampler_state = nv20_sampler_state_create;
-       nv20->pipe.bind_sampler_states = nv20_sampler_state_bind;
+       nv20->pipe.bind_fragment_sampler_states = nv20_sampler_state_bind;
        nv20->pipe.delete_sampler_state = nv20_sampler_state_delete;
-       nv20->pipe.set_sampler_textures = nv20_set_sampler_texture;
+       nv20->pipe.set_fragment_sampler_textures = nv20_set_sampler_texture;
 
        nv20->pipe.create_rasterizer_state = nv20_rasterizer_state_create;
        nv20->pipe.bind_rasterizer_state = nv20_rasterizer_state_bind;

diff --git a/src/gallium/drivers/nv30/nv30_state.c b/src/gallium/drivers/nv30/nv30_state.c
index b91e972c12336783abd0910564f87e011eaf7b31..3f802d924166383db5cfc786a4a4e90d70c513e6 100644 (file)
--- a/src/gallium/drivers/nv30/nv30_state.c
+++ b/src/gallium/drivers/nv30/nv30_state.c
@@ -690,9 +690,9 @@ nv30_init_state_functions(struct nv30_context *nv30)
        nv30->pipe.delete_blend_state = nv30_blend_state_delete;
 
        nv30->pipe.create_sampler_state = nv30_sampler_state_create;
-       nv30->pipe.bind_sampler_states = nv30_sampler_state_bind;
+       nv30->pipe.bind_fragment_sampler_states = nv30_sampler_state_bind;
        nv30->pipe.delete_sampler_state = nv30_sampler_state_delete;
-       nv30->pipe.set_sampler_textures = nv30_set_sampler_texture;
+       nv30->pipe.set_fragment_sampler_textures = nv30_set_sampler_texture;
 
        nv30->pipe.create_rasterizer_state = nv30_rasterizer_state_create;
        nv30->pipe.bind_rasterizer_state = nv30_rasterizer_state_bind;

diff --git a/src/gallium/drivers/nv40/nv40_state.c b/src/gallium/drivers/nv40/nv40_state.c
index c3ee4d234537d1dc317649dff573316899c46f94..bc34e32a4b9a2c07474a8ee1d3214af5f9bd0255 100644 (file)
--- a/src/gallium/drivers/nv40/nv40_state.c
+++ b/src/gallium/drivers/nv40/nv40_state.c
@@ -705,9 +705,9 @@ nv40_init_state_functions(struct nv40_context *nv40)
        nv40->pipe.delete_blend_state = nv40_blend_state_delete;
 
        nv40->pipe.create_sampler_state = nv40_sampler_state_create;
-       nv40->pipe.bind_sampler_states = nv40_sampler_state_bind;
+       nv40->pipe.bind_fragment_sampler_states = nv40_sampler_state_bind;
        nv40->pipe.delete_sampler_state = nv40_sampler_state_delete;
-       nv40->pipe.set_sampler_textures = nv40_set_sampler_texture;
+       nv40->pipe.set_fragment_sampler_textures = nv40_set_sampler_texture;
 
        nv40->pipe.create_rasterizer_state = nv40_rasterizer_state_create;
        nv40->pipe.bind_rasterizer_state = nv40_rasterizer_state_bind;

diff --git a/src/gallium/drivers/nv50/nv50_state.c b/src/gallium/drivers/nv50/nv50_state.c
index ffaa5e29d1c22286a422efa1afa3179cfd65e6f3..07318f23947bc34ba33d37527e2729e885e8b18e 100644 (file)
--- a/src/gallium/drivers/nv50/nv50_state.c
+++ b/src/gallium/drivers/nv50/nv50_state.c
@@ -648,9 +648,9 @@ nv50_init_state_functions(struct nv50_context *nv50)
        nv50->pipe.delete_blend_state = nv50_blend_state_delete;
 
        nv50->pipe.create_sampler_state = nv50_sampler_state_create;
-       nv50->pipe.bind_sampler_states = nv50_sampler_state_bind;
+       nv50->pipe.bind_fragment_sampler_states = nv50_sampler_state_bind;
        nv50->pipe.delete_sampler_state = nv50_sampler_state_delete;
-       nv50->pipe.set_sampler_textures = nv50_set_sampler_texture;
+       nv50->pipe.set_fragment_sampler_textures = nv50_set_sampler_texture;
 
        nv50->pipe.create_rasterizer_state = nv50_rasterizer_state_create;
        nv50->pipe.bind_rasterizer_state = nv50_rasterizer_state_bind;