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 | 109e87dc6aed1ad42d36b3757accbb7e79401bce (patch) | |
| tree | 02f3d831a2ce02efaa93a0b53c2da271130a21b9 | |
| parent | d4ab8bd0955f1b114acee80f17a2e82c7129cc1a (diff) | |
gallium/trace: add 'start' parameter to bind_sampler_states/views()
| -rw-r--r-- | src/gallium/drivers/trace/tr_context.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/gallium/drivers/trace/tr_context.c b/src/gallium/drivers/trace/tr_context.c index 54ad0e9197a..f50a7426ed5 100644 --- a/src/gallium/drivers/trace/tr_context.c +++ b/src/gallium/drivers/trace/tr_context.c @@ -290,12 +290,16 @@ trace_context_create_sampler_state(struct pipe_context *_pipe, static INLINE void trace_context_bind_sampler_states(struct pipe_context *_pipe, unsigned shader, + unsigned start, unsigned num_states, void **states) { struct trace_context *tr_ctx = trace_context(_pipe); struct pipe_context *pipe = tr_ctx->pipe; + /* remove this when we have pipe->bind_sampler_states(..., start, ...) */ + assert(start == 0); + switch (shader) { case PIPE_SHADER_VERTEX: trace_dump_call_begin("pipe_context", "bind_vertex_sampler_states"); @@ -337,7 +341,8 @@ trace_context_bind_fragment_sampler_states(struct pipe_context *_pipe, unsigned num, void **states) { - trace_context_bind_sampler_states(_pipe, PIPE_SHADER_FRAGMENT, num, states); + trace_context_bind_sampler_states(_pipe, PIPE_SHADER_FRAGMENT, + 0, num, states); } @@ -346,7 +351,8 @@ trace_context_bind_vertex_sampler_states(struct pipe_context *_pipe, unsigned num, void **states) { - trace_context_bind_sampler_states(_pipe, PIPE_SHADER_VERTEX, num, states); + trace_context_bind_sampler_states(_pipe, PIPE_SHADER_VERTEX, + 0, num, states); } @@ -984,6 +990,7 @@ trace_context_surface_destroy(struct pipe_context *_pipe, static INLINE void trace_context_set_sampler_views(struct pipe_context *_pipe, unsigned shader, + unsigned start, unsigned num, struct pipe_sampler_view **views) { @@ -993,6 +1000,9 @@ trace_context_set_sampler_views(struct pipe_context *_pipe, struct pipe_sampler_view *unwrapped_views[PIPE_MAX_SAMPLERS]; unsigned i; + /* remove this when we have pipe->set_sampler_views(..., start, ...) */ + assert(start == 0); + for(i = 0; i < num; ++i) { tr_view = trace_sampler_view(views[i]); unwrapped_views[i] = tr_view ? tr_view->sampler_view : NULL; @@ -1041,7 +1051,7 @@ trace_context_set_fragment_sampler_views(struct pipe_context *_pipe, unsigned num, struct pipe_sampler_view **views) { - trace_context_set_sampler_views(_pipe, PIPE_SHADER_FRAGMENT, num, views); + trace_context_set_sampler_views(_pipe, PIPE_SHADER_FRAGMENT, 0, num, views); } @@ -1050,7 +1060,7 @@ trace_context_set_vertex_sampler_views(struct pipe_context *_pipe, unsigned num, struct pipe_sampler_view **views) { - trace_context_set_sampler_views(_pipe, PIPE_SHADER_VERTEX, num, views); + trace_context_set_sampler_views(_pipe, PIPE_SHADER_VERTEX, 0, num, views); } |