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/paint.c | |
| 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/paint.c')
| -rw-r--r-- | src/gallium/state_trackers/vega/paint.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gallium/state_trackers/vega/paint.c b/src/gallium/state_trackers/vega/paint.c index cc73771d35..d8f6299b2d 100644 --- a/src/gallium/state_trackers/vega/paint.c +++ b/src/gallium/state_trackers/vega/paint.c @@ -77,7 +77,8 @@ struct vg_paint { struct pipe_sampler_state sampler; } pattern; - struct pipe_constant_buffer cbuf; + /* XXX next 3 all unneded? */ + struct pipe_buffer *cbuf; struct pipe_shader_state fs_state; void *fs; }; |