gallium/tests: use pipe_context::bind_sampler_states()

This commit is contained in:
Brian Paul 2013-09-12 15:40:13 -06:00
parent bc367ab54d
commit a5350a9f3e
8 changed files with 13 additions and 9 deletions

View file

@ -371,7 +371,7 @@ static void init_tex( void )
if (sampler == NULL)
exit(6);
ctx->bind_fragment_sampler_states(ctx, 1, &sampler);
ctx->bind_sampler_states(ctx, PIPE_SHADER_FRAGMENT, 0, 1, &sampler);
}

View file

@ -478,7 +478,7 @@ static void init_tex( void )
if (sampler == NULL)
exit(6);
ctx->bind_fragment_sampler_states(ctx, 1, &sampler);
ctx->bind_sampler_states(ctx, PIPE_SHADER_FRAGMENT, 0, 1, &sampler);
}

View file

@ -286,7 +286,7 @@ static void init_tex( void )
if (sampler == NULL)
exit(6);
ctx->bind_fragment_sampler_states(ctx, 1, &sampler);
ctx->bind_sampler_states(ctx, PIPE_SHADE_FRAGMENT, 0, 1, &sampler);
}

View file

@ -172,7 +172,8 @@ static void init_tex( void )
sampler = graw_util_create_simple_sampler(&info,
PIPE_TEX_WRAP_REPEAT,
PIPE_TEX_FILTER_NEAREST);
info.ctx->bind_fragment_sampler_states(info.ctx, 1, &sampler);
info.ctx->bind_sampler_states(info.ctx, PIPE_SHADER_FRAGMENT,
0, 1, &sampler);
}

View file

@ -165,7 +165,8 @@ static void init_tex( void )
sampler = graw_util_create_simple_sampler(&info,
PIPE_TEX_WRAP_REPEAT,
PIPE_TEX_FILTER_NEAREST);
info.ctx->bind_fragment_sampler_states(info.ctx, 1, &sampler);
info.ctx->bind_sampler_states(info.ctx, PIPE_SHADER_FRAGMENT,
0, 1, &sampler);
}
/* linear sampler view */

View file

@ -152,7 +152,8 @@ init_tex(const unsigned swizzle[4])
PIPE_TEX_WRAP_REPEAT,
PIPE_TEX_FILTER_NEAREST);
info.ctx->bind_fragment_sampler_states(info.ctx, 1, &sampler);
info.ctx->bind_sampler_states(info.ctx, PIPE_SHADER_FRAGMENT,
0, 1, &sampler);
#undef SIZE
}

View file

@ -365,7 +365,7 @@ static void init_tex( void )
if (sampler == NULL)
exit(6);
ctx->bind_fragment_sampler_states(ctx, 1, &sampler);
ctx->bind_sampler_states(ctx, PIPE_SHADER_FRAGMENT, 0, 1, &sampler);
}

View file

@ -380,7 +380,7 @@ static void init_sampler_states(struct context *ctx, int n)
assert(ctx->hwsmp[i]);
}
pipe->bind_compute_sampler_states(pipe, 0, i, ctx->hwsmp);
pipe->bind_sampler_states(pipe, PIPE_SHADER_COMPUTE, 0, i, ctx->hwsmp);
}
static void destroy_sampler_states(struct context *ctx)
@ -388,7 +388,8 @@ static void destroy_sampler_states(struct context *ctx)
struct pipe_context *pipe = ctx->pipe;
int i;
pipe->bind_compute_sampler_states(pipe, 0, MAX_RESOURCES, NULL);
pipe->bind_sampler_states(pipe, PIPE_SHADER_COMPUTE,
0, MAX_RESOURCES, NULL);
for (i = 0; i < MAX_RESOURCES; ++i) {
if (ctx->hwsmp[i]) {