diff options
| -rw-r--r-- | src/gallium/tests/graw/fs-test.c | 2 | ||||
| -rw-r--r-- | src/gallium/tests/graw/gs-test.c | 2 | ||||
| -rw-r--r-- | src/gallium/tests/graw/quad-sample.c | 2 | ||||
| -rw-r--r-- | src/gallium/tests/graw/quad-tex.c | 3 | ||||
| -rw-r--r-- | src/gallium/tests/graw/tex-srgb.c | 3 | ||||
| -rw-r--r-- | src/gallium/tests/graw/tex-swizzle.c | 3 | ||||
| -rw-r--r-- | src/gallium/tests/graw/vs-test.c | 2 | ||||
| -rw-r--r-- | src/gallium/tests/trivial/compute.c | 5 |
8 files changed, 13 insertions, 9 deletions
diff --git a/src/gallium/tests/graw/fs-test.c b/src/gallium/tests/graw/fs-test.c index 38a2c4b8c5e..d9627913cff 100644 --- a/src/gallium/tests/graw/fs-test.c +++ b/src/gallium/tests/graw/fs-test.c @@ -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); } diff --git a/src/gallium/tests/graw/gs-test.c b/src/gallium/tests/graw/gs-test.c index e4e4f61eba1..2a8f26eedd4 100644 --- a/src/gallium/tests/graw/gs-test.c +++ b/src/gallium/tests/graw/gs-test.c @@ -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); } diff --git a/src/gallium/tests/graw/quad-sample.c b/src/gallium/tests/graw/quad-sample.c index 969ffa71cd8..847cb95a7cc 100644 --- a/src/gallium/tests/graw/quad-sample.c +++ b/src/gallium/tests/graw/quad-sample.c @@ -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); } diff --git a/src/gallium/tests/graw/quad-tex.c b/src/gallium/tests/graw/quad-tex.c index 6cfcea33dd1..7802d8efddf 100644 --- a/src/gallium/tests/graw/quad-tex.c +++ b/src/gallium/tests/graw/quad-tex.c @@ -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); } diff --git a/src/gallium/tests/graw/tex-srgb.c b/src/gallium/tests/graw/tex-srgb.c index 296d22afc54..5035fa781a9 100644 --- a/src/gallium/tests/graw/tex-srgb.c +++ b/src/gallium/tests/graw/tex-srgb.c @@ -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 */ diff --git a/src/gallium/tests/graw/tex-swizzle.c b/src/gallium/tests/graw/tex-swizzle.c index 4ee79ee7a24..65c1d4dde5e 100644 --- a/src/gallium/tests/graw/tex-swizzle.c +++ b/src/gallium/tests/graw/tex-swizzle.c @@ -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 } diff --git a/src/gallium/tests/graw/vs-test.c b/src/gallium/tests/graw/vs-test.c index 5a7d0a00eee..f351928592b 100644 --- a/src/gallium/tests/graw/vs-test.c +++ b/src/gallium/tests/graw/vs-test.c @@ -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); } diff --git a/src/gallium/tests/trivial/compute.c b/src/gallium/tests/trivial/compute.c index 5337b86e8fe..339c2647e81 100644 --- a/src/gallium/tests/trivial/compute.c +++ b/src/gallium/tests/trivial/compute.c @@ -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]) { |