diff options
| author | Roland Scheidegger <[email protected]> | 2010-01-15 18:09:45 +0100 |
|---|---|---|
| committer | Roland Scheidegger <[email protected]> | 2010-01-15 18:09:45 +0100 |
| commit | 5e5d0ad08167c178fcda005862e3dbead3e8c482 (patch) | |
| tree | f08d0cf2725fede62ada26e8815d6d9eeebdf337 /src/gallium/drivers/softpipe/sp_context.h | |
| 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/softpipe/sp_context.h')
| -rw-r--r-- | src/gallium/drivers/softpipe/sp_context.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/softpipe/sp_context.h b/src/gallium/drivers/softpipe/sp_context.h index 73fa744f9d4..da673c57ada 100644 --- a/src/gallium/drivers/softpipe/sp_context.h +++ b/src/gallium/drivers/softpipe/sp_context.h @@ -63,7 +63,7 @@ struct softpipe_context { /** Other rendering state */ struct pipe_blend_color blend_color; struct pipe_clip_state clip; - struct pipe_constant_buffer constants[PIPE_SHADER_TYPES]; + struct pipe_buffer *constants[PIPE_SHADER_TYPES]; struct pipe_framebuffer_state framebuffer; struct pipe_poly_stipple poly_stipple; struct pipe_scissor_state scissor; |