diff options
| author | José Fonseca <jfonseca@vmware.com> | 2010-01-06 13:52:22 +0000 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2010-01-06 13:52:22 +0000 |
| commit | e32487b8a13a9efabb0359a9dde33e074e905e82 (patch) | |
| tree | fbfdb33273371a5faec1de4ff97b803766eacf63 /src/gallium/drivers/svga/svga_context.h | |
| parent | aaf7ecfd816f82fef314f4f772cc53bc0ced553e (diff) | |
| parent | 5b64d94390e4805e1634f0c8b5e3156e12b8b872 (diff) | |
Merge remote branch 'origin/mesa_7_7_branch'
Conflicts:
configs/default
src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
src/mesa/main/version.h
Diffstat (limited to 'src/gallium/drivers/svga/svga_context.h')
| -rw-r--r-- | src/gallium/drivers/svga/svga_context.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gallium/drivers/svga/svga_context.h b/src/gallium/drivers/svga/svga_context.h index fa7f6cb3bb..66259fd010 100644 --- a/src/gallium/drivers/svga/svga_context.h +++ b/src/gallium/drivers/svga/svga_context.h @@ -266,8 +266,6 @@ struct svga_hw_draw_state unsigned ts[16][TS_MAX]; float cb[PIPE_SHADER_TYPES][CB_MAX][4]; - unsigned shader_id[PIPE_SHADER_TYPES]; - struct svga_shader_result *fs; struct svga_shader_result *vs; struct svga_hw_view_state views[PIPE_MAX_SAMPLERS]; |