diff options
| author | Rob Clark <[email protected]> | 2019-03-14 08:48:08 -0400 |
|---|---|---|
| committer | Rob Clark <[email protected]> | 2019-03-30 13:04:00 -0400 |
| commit | e167e8f8a2bc50a0f34864363e0746aced034a8b (patch) | |
| tree | 388bb1a19e473eb46e1d51a371514ac1f14e1404 | |
| parent | 7ff6705b8d89fb2cf43604aefc96ed634c78be9d (diff) | |
gallium/docs: clarify set_sampler_views (v2)
Signed-off-by: Rob Clark <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
| -rw-r--r-- | src/gallium/docs/source/context.rst | 5 | ||||
| -rw-r--r-- | src/gallium/include/pipe/p_context.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/gallium/docs/source/context.rst b/src/gallium/docs/source/context.rst index f89d9e1005e..06d30bfb38b 100644 --- a/src/gallium/docs/source/context.rst +++ b/src/gallium/docs/source/context.rst @@ -143,6 +143,11 @@ to the array index which is used for sampling. to a respective sampler view and releases a reference to the previous sampler view. + Sampler views outside of ``[start_slot, start_slot + num_views)`` are + unmodified. If ``views`` is NULL, the behavior is the same as if + ``views[n]`` was NULL for the entire range, ie. releasing the reference + for all the sampler views in the specified range. + * ``create_sampler_view`` creates a new sampler view. ``texture`` is associated with the sampler view which results in sampler view holding a reference to the texture. Format specified in template must be compatible diff --git a/src/gallium/include/pipe/p_context.h b/src/gallium/include/pipe/p_context.h index e07b76d4f03..5c62ed49fa7 100644 --- a/src/gallium/include/pipe/p_context.h +++ b/src/gallium/include/pipe/p_context.h @@ -327,7 +327,7 @@ struct pipe_context { void (*set_sampler_views)(struct pipe_context *, enum pipe_shader_type shader, unsigned start_slot, unsigned num_views, - struct pipe_sampler_view **); + struct pipe_sampler_view **views); void (*set_tess_state)(struct pipe_context *, const float default_outer_level[4], |