gallium/trace: add 'start' parameter to bind_sampler_states/views()

This commit is contained in:
Brian Paul 2012-08-09 20:59:44 -06:00
parent d4ab8bd095
commit 109e87dc6a

View file

@ -290,12 +290,16 @@ trace_context_create_sampler_state(struct pipe_context *_pipe,
static INLINE void static INLINE void
trace_context_bind_sampler_states(struct pipe_context *_pipe, trace_context_bind_sampler_states(struct pipe_context *_pipe,
unsigned shader, unsigned shader,
unsigned start,
unsigned num_states, unsigned num_states,
void **states) void **states)
{ {
struct trace_context *tr_ctx = trace_context(_pipe); struct trace_context *tr_ctx = trace_context(_pipe);
struct pipe_context *pipe = tr_ctx->pipe; struct pipe_context *pipe = tr_ctx->pipe;
/* remove this when we have pipe->bind_sampler_states(..., start, ...) */
assert(start == 0);
switch (shader) { switch (shader) {
case PIPE_SHADER_VERTEX: case PIPE_SHADER_VERTEX:
trace_dump_call_begin("pipe_context", "bind_vertex_sampler_states"); 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, unsigned num,
void **states) 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, unsigned num,
void **states) 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 static INLINE void
trace_context_set_sampler_views(struct pipe_context *_pipe, trace_context_set_sampler_views(struct pipe_context *_pipe,
unsigned shader, unsigned shader,
unsigned start,
unsigned num, unsigned num,
struct pipe_sampler_view **views) 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]; struct pipe_sampler_view *unwrapped_views[PIPE_MAX_SAMPLERS];
unsigned i; unsigned i;
/* remove this when we have pipe->set_sampler_views(..., start, ...) */
assert(start == 0);
for(i = 0; i < num; ++i) { for(i = 0; i < num; ++i) {
tr_view = trace_sampler_view(views[i]); tr_view = trace_sampler_view(views[i]);
unwrapped_views[i] = tr_view ? tr_view->sampler_view : NULL; 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, unsigned num,
struct pipe_sampler_view **views) 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, unsigned num,
struct pipe_sampler_view **views) 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);
} }