gallium: remove const qualifier from pipe_buffer argument in set_constant_buffer

[mesa.git] / src / gallium / drivers / nv10 / nv10_state.c

diff --git a/src/gallium/drivers/nv10/nv10_state.c b/src/gallium/drivers/nv10/nv10_state.c
index 9b38219b996d70cbc1d607c11e35586b8fe6db1f..ad7def53b12c3b99421ce46406e5f58ce6f7bb08 100644 (file)
--- a/src/gallium/drivers/nv10/nv10_state.c
+++ b/src/gallium/drivers/nv10/nv10_state.c
@@ -458,7 +458,7 @@ nv10_set_clip_state(struct pipe_context *pipe,
 
 static void
 nv10_set_constant_buffer(struct pipe_context *pipe, uint shader, uint index,
-                        const struct pipe_constant_buffer *buf )
+                        struct pipe_buffer *buf )
 {
        struct nv10_context *nv10 = nv10_context(pipe);
        struct pipe_screen *pscreen = pipe->screen;
@@ -468,13 +468,13 @@ nv10_set_constant_buffer(struct pipe_context *pipe, uint shader, uint index,
 
        if (buf) {
                void *mapped;
-               if (buf->buffer && buf->buffer->size &&
-                    (mapped = pipe_buffer_map(pscreen, buf->buffer, PIPE_BUFFER_USAGE_CPU_READ)))
+               if (buf->size &&
+                    (mapped = pipe_buffer_map(pscreen, buf, PIPE_BUFFER_USAGE_CPU_READ)))
                {
-                       memcpy(nv10->constbuf[shader], mapped, buf->buffer->size);
+                       memcpy(nv10->constbuf[shader], mapped, buf->size);
                        nv10->constbuf_nr[shader] =
-                               buf->buffer->size / (4 * sizeof(float));
-                       pipe_buffer_unmap(pscreen, buf->buffer);
+                               buf->size / (4 * sizeof(float));
+                       pipe_buffer_unmap(pscreen, buf);
                }
        }
 }
@@ -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;