KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

st/nine: stop using cso_set_sampler_views 

It will be removed.

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8180>
This commit is contained in:
Marek Olšák 2020-12-20 00:43:08 -05:00
parent 95c5675180
commit fc78ecd379
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gallium/frontends/nine/nine_state.c
View File

@ -961,6 +961,7 @@ static void
update_textures_and_samplers(struct NineDevice9 *device)
{
struct nine_context *context = &device->context;
struct pipe_context *pipe = context->pipe;
struct pipe_sampler_view *view[NINE_MAX_SAMPLERS];
unsigned num_textures;
unsigned i;
@ -1012,7 +1013,7 @@ update_textures_and_samplers(struct NineDevice9 *device)
context->bound_samplers_mask_ps |= (1 << s);
}
cso_set_sampler_views(context->cso, PIPE_SHADER_FRAGMENT, num_textures, view);
pipe->set_sampler_views(pipe, PIPE_SHADER_FRAGMENT, 0, num_textures, view);
if (commit_samplers)
cso_single_sampler_done(context->cso, PIPE_SHADER_FRAGMENT);
@ -1060,7 +1061,7 @@ update_textures_and_samplers(struct NineDevice9 *device)
context->bound_samplers_mask_vs |= (1 << i);
}
cso_set_sampler_views(context->cso, PIPE_SHADER_VERTEX, num_textures, view);
pipe->set_sampler_views(pipe, PIPE_SHADER_VERTEX, 0, num_textures, view);
if (commit_samplers)
cso_single_sampler_done(context->cso, PIPE_SHADER_VERTEX);
@ -2912,8 +2913,8 @@ nine_context_clear(struct NineDevice9 *device)
cso_set_samplers(cso, PIPE_SHADER_VERTEX, 0, NULL);
cso_set_samplers(cso, PIPE_SHADER_FRAGMENT, 0, NULL);
cso_set_sampler_views(cso, PIPE_SHADER_VERTEX, 0, NULL);
cso_set_sampler_views(cso, PIPE_SHADER_FRAGMENT, 0, NULL);
pipe->set_sampler_views(pipe, PIPE_SHADER_VERTEX, 0, NINE_MAX_SAMPLERS_VS, NULL);
pipe->set_sampler_views(pipe, PIPE_SHADER_FRAGMENT, 0, NINE_MAX_SAMPLERS_PS, NULL);
pipe->set_vertex_buffers(pipe, 0, device->caps.MaxStreams, NULL);