gallium: remove const qualifier from pipe_buffer argument in set_constant_buffer

[mesa.git] / src / gallium / drivers / nv04 / nv04_state.c

diff --git a/src/gallium/drivers/nv04/nv04_state.c b/src/gallium/drivers/nv04/nv04_state.c
index 87c635f962a6dcf5934174ab35805b57272f8591..871034ad0b9275e858cdfad5b8fde91b9ad5e8f2 100644 (file)
--- a/src/gallium/drivers/nv04/nv04_state.c
+++ b/src/gallium/drivers/nv04/nv04_state.c
@@ -2,6 +2,7 @@
 #include "pipe/p_state.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_shader_tokens.h"
+#include "pipe/p_inlines.h"
 
 #include "tgsi/tgsi_parse.h"
 
@@ -331,23 +332,23 @@ nv04_set_clip_state(struct pipe_context *pipe,
 
 static void
 nv04_set_constant_buffer(struct pipe_context *pipe, uint shader, uint index,
-                        const struct pipe_constant_buffer *buf )
+                        struct pipe_buffer *buf )
 {
        struct nv04_context *nv04 = nv04_context(pipe);
-       struct pipe_winsys *ws = pipe->winsys;
+       struct pipe_screen *pscreen = pipe->screen;
 
        assert(shader < PIPE_SHADER_TYPES);
        assert(index == 0);
 
        if (buf) {
                void *mapped;
-               if (buf->buffer && buf->buffer->size &&
-                    (mapped = ws->buffer_map(ws, buf->buffer, PIPE_BUFFER_USAGE_CPU_READ)))
+               if (buf && buf->size &&
+                    (mapped = pipe_buffer_map(pscreen, buf, PIPE_BUFFER_USAGE_CPU_READ)))
                {
-                       memcpy(nv04->constbuf[shader], mapped, buf->buffer->size);
+                       memcpy(nv04->constbuf[shader], mapped, buf->size);
                        nv04->constbuf_nr[shader] =
-                               buf->buffer->size / (4 * sizeof(float));
-                       ws->buffer_unmap(ws, buf->buffer);
+                               buf->size / (4 * sizeof(float));
+                       pipe_buffer_unmap(pscreen, buf);
                }
        }
 }
@@ -424,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;