diff options
| author | Brian Paul <[email protected]> | 2012-08-09 20:59:44 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2012-08-16 09:01:31 -0600 |
| commit | 10e552d056dd080c4e763a31df517c2d7684a9cf (patch) | |
| tree | 00ba2f1600059660b7d111b42c375885c1cce176 /src/gallium/drivers/rbug/rbug_context.h | |
| parent | 109e87dc6aed1ad42d36b3757accbb7e79401bce (diff) | |
rbug: update data structures, functions for future changes
To support geom/compute/etc shaders, samplers, sampler views, etc.
To support pipe->bind_sampler_states() w/ start_slot.
Diffstat (limited to 'src/gallium/drivers/rbug/rbug_context.h')
| -rw-r--r-- | src/gallium/drivers/rbug/rbug_context.h | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/gallium/drivers/rbug/rbug_context.h b/src/gallium/drivers/rbug/rbug_context.h index 0a41bbd1047..6b44da0de6a 100644 --- a/src/gallium/drivers/rbug/rbug_context.h +++ b/src/gallium/drivers/rbug/rbug_context.h @@ -46,17 +46,11 @@ struct rbug_context { /* current state */ struct { - struct rbug_shader *fs; - struct rbug_shader *vs; - struct rbug_shader *gs; + struct rbug_shader *shader[PIPE_SHADER_TYPES]; - struct rbug_sampler_view *fs_views[PIPE_MAX_SAMPLERS]; - struct rbug_resource *fs_texs[PIPE_MAX_SAMPLERS]; - unsigned num_fs_views; - - struct rbug_sampler_view *vs_views[PIPE_MAX_SAMPLERS]; - struct rbug_resource *vs_texs[PIPE_MAX_SAMPLERS]; - unsigned num_vs_views; + struct rbug_sampler_view *views[PIPE_SHADER_TYPES][PIPE_MAX_SAMPLERS]; + struct rbug_resource *texs[PIPE_SHADER_TYPES][PIPE_MAX_SAMPLERS]; + unsigned num_views[PIPE_SHADER_TYPES]; unsigned nr_cbufs; struct rbug_resource *cbufs[PIPE_MAX_COLOR_BUFS]; @@ -71,8 +65,7 @@ struct rbug_context { int draw_blocked; struct { - struct rbug_shader *fs; - struct rbug_shader *vs; + struct rbug_shader *shader[PIPE_SHADER_TYPES]; struct rbug_resource *texture; struct rbug_resource *surf; |