diff options
| author | Roland Scheidegger <sroland@vmware.com> | 2010-01-15 18:09:45 +0100 |
|---|---|---|
| committer | Roland Scheidegger <sroland@vmware.com> | 2010-01-15 18:09:45 +0100 |
| commit | 5e5d0ad08167c178fcda005862e3dbead3e8c482 (patch) | |
| tree | f08d0cf2725fede62ada26e8815d6d9eeebdf337 /src/gallium/drivers/nv50 | |
| parent | 1c4ad778126788cebcb54342837042bfe432d504 (diff) | |
| parent | 70c8d2a29724d018bacc4a68ddc61db08faea00d (diff) | |
Merge branch 'gallium-noconstbuf'
Conflicts:
src/gallium/drivers/softpipe/sp_draw_arrays.c
src/mesa/state_tracker/st_draw_feedback.c
Diffstat (limited to 'src/gallium/drivers/nv50')
| -rw-r--r-- | src/gallium/drivers/nv50/nv50_state.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/nv50/nv50_state.c b/src/gallium/drivers/nv50/nv50_state.c index 1f67df814b..1bbbbdd5f0 100644 --- a/src/gallium/drivers/nv50/nv50_state.c +++ b/src/gallium/drivers/nv50/nv50_state.c @@ -585,16 +585,16 @@ nv50_set_clip_state(struct pipe_context *pipe, static void nv50_set_constant_buffer(struct pipe_context *pipe, uint shader, uint index, - const struct pipe_constant_buffer *buf ) + struct pipe_buffer *buf ) { struct nv50_context *nv50 = nv50_context(pipe); if (shader == PIPE_SHADER_VERTEX) { - nv50->constbuf[PIPE_SHADER_VERTEX] = buf->buffer; + nv50->constbuf[PIPE_SHADER_VERTEX] = buf; nv50->dirty |= NV50_NEW_VERTPROG_CB; } else if (shader == PIPE_SHADER_FRAGMENT) { - nv50->constbuf[PIPE_SHADER_FRAGMENT] = buf->buffer; + nv50->constbuf[PIPE_SHADER_FRAGMENT] = buf; nv50->dirty |= NV50_NEW_FRAGPROG_CB; } } |