From d0520d5bf6fb8dec8434d6b68dd014227a1bdaa3 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 12 Sep 2013 15:34:02 -0600 Subject: [PATCH] vl: remove old bind_fragment_sampler_states() calls --- src/gallium/auxiliary/vl/vl_compositor.c | 8 ++------ src/gallium/auxiliary/vl/vl_idct.c | 14 ++++---------- src/gallium/auxiliary/vl/vl_matrix_filter.c | 8 ++------ src/gallium/auxiliary/vl/vl_mc.c | 8 ++------ src/gallium/auxiliary/vl/vl_median_filter.c | 8 ++------ src/gallium/auxiliary/vl/vl_mpeg12_decoder.c | 10 +++------- src/gallium/auxiliary/vl/vl_zscan.c | 8 ++------ 7 files changed, 17 insertions(+), 47 deletions(-) diff --git a/src/gallium/auxiliary/vl/vl_compositor.c b/src/gallium/auxiliary/vl/vl_compositor.c index a2a113999ad..db4c697828f 100644 --- a/src/gallium/auxiliary/vl/vl_compositor.c +++ b/src/gallium/auxiliary/vl/vl_compositor.c @@ -725,12 +725,8 @@ draw_layers(struct vl_compositor *c, struct vl_compositor_state *s, struct u_rec c->pipe->bind_blend_state(c->pipe, blend); c->pipe->set_viewport_states(c->pipe, 0, 1, &layer->viewport); c->pipe->bind_fs_state(c->pipe, layer->fs); - if (c->pipe->bind_sampler_states) - c->pipe->bind_sampler_states(c->pipe, PIPE_SHADER_FRAGMENT, 0, - num_sampler_views, layer->samplers); - else - c->pipe->bind_fragment_sampler_states(c->pipe, num_sampler_views, - layer->samplers); + c->pipe->bind_sampler_states(c->pipe, PIPE_SHADER_FRAGMENT, 0, + num_sampler_views, layer->samplers); c->pipe->set_fragment_sampler_views(c->pipe, num_sampler_views, samplers); util_draw_arrays(c->pipe, PIPE_PRIM_QUADS, vb_index * 4, 4); vb_index++; diff --git a/src/gallium/auxiliary/vl/vl_idct.c b/src/gallium/auxiliary/vl/vl_idct.c index d31bf4120e9..dc14bb71b46 100644 --- a/src/gallium/auxiliary/vl/vl_idct.c +++ b/src/gallium/auxiliary/vl/vl_idct.c @@ -826,11 +826,8 @@ vl_idct_flush(struct vl_idct *idct, struct vl_idct_buffer *buffer, unsigned num_ idct->pipe->bind_rasterizer_state(idct->pipe, idct->rs_state); idct->pipe->bind_blend_state(idct->pipe, idct->blend); - if (idct->pipe->bind_sampler_states) - idct->pipe->bind_sampler_states(idct->pipe, PIPE_SHADER_FRAGMENT, - 0, 2, idct->samplers); - else - idct->pipe->bind_fragment_sampler_states(idct->pipe, 2, idct->samplers); + idct->pipe->bind_sampler_states(idct->pipe, PIPE_SHADER_FRAGMENT, + 0, 2, idct->samplers); idct->pipe->set_fragment_sampler_views(idct->pipe, 2, buffer->sampler_views.stage[0]); @@ -856,11 +853,8 @@ vl_idct_prepare_stage2(struct vl_idct *idct, struct vl_idct_buffer *buffer) /* second stage */ idct->pipe->bind_rasterizer_state(idct->pipe, idct->rs_state); - if (idct->pipe->bind_sampler_states) - idct->pipe->bind_sampler_states(idct->pipe, PIPE_SHADER_FRAGMENT, - 0, 2, idct->samplers); - else - idct->pipe->bind_fragment_sampler_states(idct->pipe, 2, idct->samplers); + idct->pipe->bind_sampler_states(idct->pipe, PIPE_SHADER_FRAGMENT, + 0, 2, idct->samplers); idct->pipe->set_fragment_sampler_views(idct->pipe, 2, buffer->sampler_views.stage[1]); } diff --git a/src/gallium/auxiliary/vl/vl_matrix_filter.c b/src/gallium/auxiliary/vl/vl_matrix_filter.c index f4fd07d865f..b7c88e776b6 100644 --- a/src/gallium/auxiliary/vl/vl_matrix_filter.c +++ b/src/gallium/auxiliary/vl/vl_matrix_filter.c @@ -306,12 +306,8 @@ vl_matrix_filter_render(struct vl_matrix_filter *filter, filter->pipe->bind_rasterizer_state(filter->pipe, filter->rs_state); filter->pipe->bind_blend_state(filter->pipe, filter->blend); - if (filter->pipe->bind_sampler_states) - filter->pipe->bind_sampler_states(filter->pipe, PIPE_SHADER_FRAGMENT, - 0, 1, &filter->sampler); - else - filter->pipe->bind_fragment_sampler_states(filter->pipe, - 1, &filter->sampler); + filter->pipe->bind_sampler_states(filter->pipe, PIPE_SHADER_FRAGMENT, + 0, 1, &filter->sampler); filter->pipe->set_fragment_sampler_views(filter->pipe, 1, &src); filter->pipe->bind_vs_state(filter->pipe, filter->vs); filter->pipe->bind_fs_state(filter->pipe, filter->fs); diff --git a/src/gallium/auxiliary/vl/vl_mc.c b/src/gallium/auxiliary/vl/vl_mc.c index b864b210476..bd75df164ab 100644 --- a/src/gallium/auxiliary/vl/vl_mc.c +++ b/src/gallium/auxiliary/vl/vl_mc.c @@ -614,12 +614,8 @@ vl_mc_render_ref(struct vl_mc *renderer, struct vl_mc_buffer *buffer, struct pip renderer->pipe->bind_fs_state(renderer->pipe, renderer->fs_ref); renderer->pipe->set_fragment_sampler_views(renderer->pipe, 1, &ref); - if (renderer->pipe->bind_sampler_states) - renderer->pipe->bind_sampler_states(renderer->pipe, PIPE_SHADER_FRAGMENT, - 0, 1, &renderer->sampler_ref); - else - renderer->pipe->bind_fragment_sampler_states(renderer->pipe, - 1, &renderer->sampler_ref); + renderer->pipe->bind_sampler_states(renderer->pipe, PIPE_SHADER_FRAGMENT, + 0, 1, &renderer->sampler_ref); util_draw_arrays_instanced(renderer->pipe, PIPE_PRIM_QUADS, 0, 4, 0, renderer->buffer_width / VL_MACROBLOCK_WIDTH * diff --git a/src/gallium/auxiliary/vl/vl_median_filter.c b/src/gallium/auxiliary/vl/vl_median_filter.c index 9a4a54beeff..f5ef117893d 100644 --- a/src/gallium/auxiliary/vl/vl_median_filter.c +++ b/src/gallium/auxiliary/vl/vl_median_filter.c @@ -385,12 +385,8 @@ vl_median_filter_render(struct vl_median_filter *filter, filter->pipe->bind_rasterizer_state(filter->pipe, filter->rs_state); filter->pipe->bind_blend_state(filter->pipe, filter->blend); - if (filter->pipe->bind_sampler_states) - filter->pipe->bind_sampler_states(filter->pipe, PIPE_SHADER_FRAGMENT, - 0, 1, &filter->sampler); - else - filter->pipe->bind_fragment_sampler_states(filter->pipe, 1, - &filter->sampler); + filter->pipe->bind_sampler_states(filter->pipe, PIPE_SHADER_FRAGMENT, + 0, 1, &filter->sampler); filter->pipe->set_fragment_sampler_views(filter->pipe, 1, &src); filter->pipe->bind_vs_state(filter->pipe, filter->vs); filter->pipe->bind_fs_state(filter->pipe, filter->fs); diff --git a/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c b/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c index 3b577ace4d5..bc207ac725d 100644 --- a/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c +++ b/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c @@ -747,13 +747,9 @@ vl_mpeg12_end_frame(struct pipe_video_codec *decoder, vl_idct_prepare_stage2(i ? &dec->idct_c : &dec->idct_y, &buf->idct[plane]); else { dec->base.context->set_fragment_sampler_views(dec->base.context, 1, &mc_source_sv[plane]); - if (dec->base.context->bind_sampler_states) - dec->base.context->bind_sampler_states(dec->base.context, - PIPE_SHADER_FRAGMENT, - 0, 1, - &dec->sampler_ycbcr); - else - dec->base.context->bind_fragment_sampler_states(dec->base.context, 1, &dec->sampler_ycbcr); + dec->base.context->bind_sampler_states(dec->base.context, + PIPE_SHADER_FRAGMENT, + 0, 1, &dec->sampler_ycbcr); } vl_mc_render_ycbcr(i ? &dec->mc_c : &dec->mc_y, &buf->mc[i], j, buf->num_ycbcr_blocks[plane]); } diff --git a/src/gallium/auxiliary/vl/vl_zscan.c b/src/gallium/auxiliary/vl/vl_zscan.c index 706a8094703..2d616d57c7a 100644 --- a/src/gallium/auxiliary/vl/vl_zscan.c +++ b/src/gallium/auxiliary/vl/vl_zscan.c @@ -574,12 +574,8 @@ vl_zscan_render(struct vl_zscan *zscan, struct vl_zscan_buffer *buffer, unsigned zscan->pipe->bind_rasterizer_state(zscan->pipe, zscan->rs_state); zscan->pipe->bind_blend_state(zscan->pipe, zscan->blend); - if (zscan->pipe->bind_sampler_states) - zscan->pipe->bind_sampler_states(zscan->pipe, PIPE_SHADER_FRAGMENT, - 0, 3, zscan->samplers); - else - zscan->pipe->bind_fragment_sampler_states(zscan->pipe, 3, - zscan->samplers); + zscan->pipe->bind_sampler_states(zscan->pipe, PIPE_SHADER_FRAGMENT, + 0, 3, zscan->samplers); zscan->pipe->set_framebuffer_state(zscan->pipe, &buffer->fb_state); zscan->pipe->set_viewport_states(zscan->pipe, 0, 1, &buffer->viewport); zscan->pipe->set_fragment_sampler_views(zscan->pipe, 3, &buffer->src); -- 2.30.2