diff options
| author | Christian König <[email protected]> | 2011-01-08 13:24:36 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-01-08 13:24:36 +0100 |
| commit | 72e30991559017c16d48569e612dbc0970e3b9ca (patch) | |
| tree | 297326fa77f35b2b6f7d7d80a019562fd0facb06 /src/mesa/state_tracker/st_context.h | |
| parent | ef4def1d9a2a48c7e32ea3e6bf0294470dfbf4c8 (diff) | |
| parent | d8cfe464424b41bd986276e19427f0079778bf8f (diff) | |
Merge remote branch 'origin/master' into pipe-video
Conflicts:
configure.ac
src/gallium/drivers/r600/eg_asm.c
src/gallium/drivers/r600/r600_asm.c
src/gallium/drivers/r600/r600_asm.h
src/gallium/include/pipe/p_format.h
src/gallium/targets/dri-nouveau/Makefile
Diffstat (limited to 'src/mesa/state_tracker/st_context.h')
| -rw-r--r-- | src/mesa/state_tracker/st_context.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/mesa/state_tracker/st_context.h b/src/mesa/state_tracker/st_context.h index 1fd80053c1b..64a8f790e22 100644 --- a/src/mesa/state_tracker/st_context.h +++ b/src/mesa/state_tracker/st_context.h @@ -92,7 +92,10 @@ struct st_context struct pipe_sampler_state samplers[PIPE_MAX_SAMPLERS]; struct pipe_sampler_state *sampler_list[PIPE_MAX_SAMPLERS]; struct pipe_clip_state clip; - struct pipe_resource *constants[PIPE_SHADER_TYPES]; + struct { + void *ptr; + unsigned size; + } constants[PIPE_SHADER_TYPES]; struct pipe_framebuffer_state framebuffer; struct pipe_sampler_view *sampler_views[PIPE_MAX_SAMPLERS]; struct pipe_scissor_state scissor; @@ -105,15 +108,6 @@ struct st_context GLuint poly_stipple[32]; /**< In OpenGL's bottom-to-top order */ } state; - struct { - struct st_tracked_state tracked_state[PIPE_SHADER_TYPES]; - } constants; - - /* XXX unused: */ - struct { - struct gl_fragment_program *fragment_program; - } cb; - char vendor[100]; char renderer[100]; |