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/state_trackers/vega/vg_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/state_trackers/vega/vg_context.h')
| -rw-r--r-- | src/gallium/state_trackers/vega/vg_context.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/state_trackers/vega/vg_context.h b/src/gallium/state_trackers/vega/vg_context.h index ccc8889c8c..ff8c1a0421 100644 --- a/src/gallium/state_trackers/vega/vg_context.h +++ b/src/gallium/state_trackers/vega/vg_context.h @@ -113,7 +113,7 @@ struct vg_context } clear; struct { - struct pipe_constant_buffer cbuf; + struct pipe_buffer *cbuf; struct pipe_sampler_state sampler; struct vg_shader *union_fs; @@ -135,7 +135,7 @@ struct vg_context struct pipe_sampler_state blend_sampler; struct { - struct pipe_constant_buffer buffer; + struct pipe_buffer *buffer; void *color_matrix_fs; } filter; struct vg_paint *default_paint; @@ -145,7 +145,7 @@ struct vg_context struct vg_shader *plain_vs; struct vg_shader *clear_vs; struct vg_shader *texture_vs; - struct pipe_constant_buffer vs_const_buffer; + struct pipe_buffer *vs_const_buffer; }; struct vg_object { |