fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 15:20:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

cso: remove use of old bind_*_sampler_states() functions

Browse source
This commit is contained in:
Brian Paul 2013-09-12 15:24:22 -06:00
parent bcf7508a7d
commit 1446600d1a
1 changed files with 3 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/gallium/auxiliary/cso_cache/cso_context.c
View file

@ -305,7 +305,7 @@ void cso_release_all( struct cso_context *ctx )
ctx->pipe->bind_blend_state( ctx->pipe, NULL );
ctx->pipe->bind_rasterizer_state( ctx->pipe, NULL );
if (ctx->pipe->bind_sampler_states) {
{
static void *zeros[PIPE_MAX_SAMPLERS] = { NULL };
struct pipe_screen *scr = ctx->pipe->screen;
unsigned sh;
@ -318,11 +318,6 @@ void cso_release_all( struct cso_context *ctx )
}
}
}
else {
ctx->pipe->bind_fragment_sampler_states( ctx->pipe, 0, NULL );
if (ctx->pipe->bind_vertex_sampler_states)
ctx->pipe->bind_vertex_sampler_states(ctx->pipe, 0, NULL);
}
ctx->pipe->bind_depth_stencil_alpha_state( ctx->pipe, NULL );
ctx->pipe->bind_fs_state( ctx->pipe, NULL );
@ -1096,31 +1091,8 @@ single_sampler_done(struct cso_context *ctx, unsigned shader_stage)
info->nr_samplers * sizeof(void *));
info->hw.nr_samplers = info->nr_samplers;
if (ctx->pipe->bind_sampler_states) {
ctx->pipe->bind_sampler_states(ctx->pipe, shader_stage, 0,
info->nr_samplers, info->samplers);
}
else {
switch (shader_stage) {
case PIPE_SHADER_FRAGMENT:
ctx->pipe->bind_fragment_sampler_states(ctx->pipe,
info->nr_samplers,
info->samplers);
break;
case PIPE_SHADER_VERTEX:
ctx->pipe->bind_vertex_sampler_states(ctx->pipe,
info->nr_samplers,
info->samplers);
break;
case PIPE_SHADER_GEOMETRY:
ctx->pipe->bind_geometry_sampler_states(ctx->pipe,
info->nr_samplers,
info->samplers);
break;
default:
assert(!"bad shader type in single_sampler_done()");
}
}
ctx->pipe->bind_sampler_states(ctx->pipe, shader_stage, 0,
info->nr_samplers, info->samplers);
}
}