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 | d4ab8bd0955f1b114acee80f17a2e82c7129cc1a (patch) | |
| tree | f01f4b09bdfbe6b7f96a0f3827825fbf88b4e66a /src/gallium | |
| parent | f3cc4990a090ee076d8217c83aaf16e036e66686 (diff) | |
gallium/identity: add 'start' parameter to bind_sampler_states/views()
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/identity/id_context.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/gallium/drivers/identity/id_context.c b/src/gallium/drivers/identity/id_context.c index 026793484db..f5c6a5cc4fa 100644 --- a/src/gallium/drivers/identity/id_context.c +++ b/src/gallium/drivers/identity/id_context.c @@ -161,12 +161,16 @@ identity_create_sampler_state(struct pipe_context *_pipe, static void identity_bind_sampler_states(struct pipe_context *_pipe, unsigned shader, + unsigned start, unsigned num_samplers, void **samplers) { struct identity_context *id_pipe = identity_context(_pipe); struct pipe_context *pipe = id_pipe->pipe; + /* remove this when we have pipe->bind_sampler_states(..., start, ...) */ + assert(start == 0); + switch (shader) { case PIPE_SHADER_VERTEX: pipe->bind_vertex_sampler_states(pipe, num_samplers, samplers); @@ -188,7 +192,7 @@ identity_bind_fragment_sampler_states(struct pipe_context *_pipe, void **samplers) { identity_bind_sampler_states(_pipe, PIPE_SHADER_FRAGMENT, - num_samplers, samplers); + 0, num_samplers, samplers); } static void @@ -197,7 +201,7 @@ identity_bind_vertex_sampler_states(struct pipe_context *_pipe, void **samplers) { identity_bind_sampler_states(_pipe, PIPE_SHADER_VERTEX, - num_samplers, samplers); + 0, num_samplers, samplers); } static void @@ -506,6 +510,7 @@ identity_set_viewport_state(struct pipe_context *_pipe, static void identity_set_sampler_views(struct pipe_context *_pipe, unsigned shader, + unsigned start, unsigned num, struct pipe_sampler_view **_views) { @@ -515,6 +520,9 @@ identity_set_sampler_views(struct pipe_context *_pipe, struct pipe_sampler_view **views = NULL; unsigned i; + /* remove this when we have pipe->set_sampler_views(..., start, ...) */ + assert(start == 0); + if (_views) { for (i = 0; i < num; i++) unwrapped_views[i] = identity_sampler_view_unwrap(_views[i]); @@ -544,7 +552,7 @@ identity_set_fragment_sampler_views(struct pipe_context *_pipe, unsigned num, struct pipe_sampler_view **_views) { - identity_set_sampler_views(_pipe, PIPE_SHADER_FRAGMENT, num, _views); + identity_set_sampler_views(_pipe, PIPE_SHADER_FRAGMENT, 0, num, _views); } static void @@ -552,7 +560,7 @@ identity_set_vertex_sampler_views(struct pipe_context *_pipe, unsigned num, struct pipe_sampler_view **_views) { - identity_set_sampler_views(_pipe, PIPE_SHADER_VERTEX, num, _views); + identity_set_sampler_views(_pipe, PIPE_SHADER_VERTEX, 0, num, _views); } static void |