diff options
Diffstat (limited to 'src/gallium/auxiliary')
-rw-r--r-- | src/gallium/auxiliary/draw/draw_context.c | 4 | ||||
-rw-r--r-- | src/gallium/auxiliary/hud/hud_context.c | 2 | ||||
-rw-r--r-- | src/gallium/auxiliary/postprocess/pp_init.c | 2 | ||||
-rw-r--r-- | src/gallium/auxiliary/util/u_blit.c | 2 | ||||
-rw-r--r-- | src/gallium/auxiliary/util/u_blitter.c | 2 | ||||
-rw-r--r-- | src/gallium/auxiliary/util/u_tests.c | 2 | ||||
-rw-r--r-- | src/gallium/auxiliary/vl/vl_compositor.c | 2 | ||||
-rw-r--r-- | src/gallium/auxiliary/vl/vl_deint_filter.c | 1 | ||||
-rw-r--r-- | src/gallium/auxiliary/vl/vl_idct.c | 2 | ||||
-rw-r--r-- | src/gallium/auxiliary/vl/vl_matrix_filter.c | 1 | ||||
-rw-r--r-- | src/gallium/auxiliary/vl/vl_mc.c | 2 | ||||
-rw-r--r-- | src/gallium/auxiliary/vl/vl_median_filter.c | 1 | ||||
-rw-r--r-- | src/gallium/auxiliary/vl/vl_zscan.c | 2 |
13 files changed, 1 insertions, 24 deletions
diff --git a/src/gallium/auxiliary/draw/draw_context.c b/src/gallium/auxiliary/draw/draw_context.c index b0f4ca2c4c0..bb8c03c36f9 100644 --- a/src/gallium/auxiliary/draw/draw_context.c +++ b/src/gallium/auxiliary/draw/draw_context.c @@ -373,11 +373,9 @@ void draw_set_viewport_states( struct draw_context *draw, (viewport->scale[0] == 1.0f && viewport->scale[1] == 1.0f && viewport->scale[2] == 1.0f && - viewport->scale[3] == 1.0f && viewport->translate[0] == 0.0f && viewport->translate[1] == 0.0f && - viewport->translate[2] == 0.0f && - viewport->translate[3] == 0.0f); + viewport->translate[2] == 0.0f); } diff --git a/src/gallium/auxiliary/hud/hud_context.c b/src/gallium/auxiliary/hud/hud_context.c index 18a878118cb..98678fc9f1e 100644 --- a/src/gallium/auxiliary/hud/hud_context.c +++ b/src/gallium/auxiliary/hud/hud_context.c @@ -444,11 +444,9 @@ hud_draw(struct hud_context *hud, struct pipe_resource *tex) viewport.scale[0] = 0.5f * hud->fb_width; viewport.scale[1] = 0.5f * hud->fb_height; viewport.scale[2] = 1.0f; - viewport.scale[3] = 1.0f; viewport.translate[0] = 0.5f * hud->fb_width; viewport.translate[1] = 0.5f * hud->fb_height; viewport.translate[2] = 0.0f; - viewport.translate[3] = 0.0f; cso_set_framebuffer(cso, &fb); cso_set_sample_mask(cso, ~0); diff --git a/src/gallium/auxiliary/postprocess/pp_init.c b/src/gallium/auxiliary/postprocess/pp_init.c index 05a08304762..bdf66e6d63a 100644 --- a/src/gallium/auxiliary/postprocess/pp_init.c +++ b/src/gallium/auxiliary/postprocess/pp_init.c @@ -324,8 +324,6 @@ pp_init_fbos(struct pp_queue_t *ppq, unsigned int w, p->viewport.scale[0] = p->viewport.translate[0] = (float) w / 2.0f; p->viewport.scale[1] = p->viewport.translate[1] = (float) h / 2.0f; - p->viewport.scale[3] = 1.0f; - p->viewport.translate[3] = 0.0f; ppq->fbos_init = true; diff --git a/src/gallium/auxiliary/util/u_blit.c b/src/gallium/auxiliary/util/u_blit.c index 020e5f727a5..90408ffdcc6 100644 --- a/src/gallium/auxiliary/util/u_blit.c +++ b/src/gallium/auxiliary/util/u_blit.c @@ -559,11 +559,9 @@ util_blit_pixels_tex(struct blit_state *ctx, ctx->viewport.scale[0] = 0.5f * dst->width; ctx->viewport.scale[1] = 0.5f * dst->height; ctx->viewport.scale[2] = 0.5f; - ctx->viewport.scale[3] = 1.0f; ctx->viewport.translate[0] = 0.5f * dst->width; ctx->viewport.translate[1] = 0.5f * dst->height; ctx->viewport.translate[2] = 0.5f; - ctx->viewport.translate[3] = 0.0f; cso_set_viewport(ctx->cso, &ctx->viewport); /* texture */ diff --git a/src/gallium/auxiliary/util/u_blitter.c b/src/gallium/auxiliary/util/u_blitter.c index 5298603f775..9d087fe8a66 100644 --- a/src/gallium/auxiliary/util/u_blitter.c +++ b/src/gallium/auxiliary/util/u_blitter.c @@ -683,11 +683,9 @@ static void blitter_set_rectangle(struct blitter_context_priv *ctx, ctx->viewport.scale[0] = 0.5f * ctx->dst_width; ctx->viewport.scale[1] = 0.5f * ctx->dst_height; ctx->viewport.scale[2] = 1.0f; - ctx->viewport.scale[3] = 1.0f; ctx->viewport.translate[0] = 0.5f * ctx->dst_width; ctx->viewport.translate[1] = 0.5f * ctx->dst_height; ctx->viewport.translate[2] = 0.0f; - ctx->viewport.translate[3] = 0.0f; ctx->base.pipe->set_viewport_states(ctx->base.pipe, 0, 1, &ctx->viewport); } diff --git a/src/gallium/auxiliary/util/u_tests.c b/src/gallium/auxiliary/util/u_tests.c index 9483f0699d6..c0f6327b6e9 100644 --- a/src/gallium/auxiliary/util/u_tests.c +++ b/src/gallium/auxiliary/util/u_tests.c @@ -114,11 +114,9 @@ util_set_max_viewport(struct cso_context *cso, struct pipe_resource *tex) viewport.scale[0] = 0.5f * tex->width0; viewport.scale[1] = 0.5f * tex->height0; viewport.scale[2] = 1.0f; - viewport.scale[3] = 1.0f; viewport.translate[0] = 0.5f * tex->width0; viewport.translate[1] = 0.5f * tex->height0; viewport.translate[2] = 0.0f; - viewport.translate[3] = 0.0f; cso_set_viewport(cso, &viewport); } diff --git a/src/gallium/auxiliary/vl/vl_compositor.c b/src/gallium/auxiliary/vl/vl_compositor.c index 6bd1a886ed4..69839e61386 100644 --- a/src/gallium/auxiliary/vl/vl_compositor.c +++ b/src/gallium/auxiliary/vl/vl_compositor.c @@ -829,9 +829,7 @@ vl_compositor_clear_layers(struct vl_compositor_state *s) s->layers[i].blend = NULL; s->layers[i].fs = NULL; s->layers[i].viewport.scale[2] = 1; - s->layers[i].viewport.scale[3] = 1; s->layers[i].viewport.translate[2] = 0; - s->layers[i].viewport.translate[3] = 0; s->layers[i].rotate = VL_COMPOSITOR_ROTATE_0; for ( j = 0; j < 3; j++) diff --git a/src/gallium/auxiliary/vl/vl_deint_filter.c b/src/gallium/auxiliary/vl/vl_deint_filter.c index a4554240f27..8fa70e84c66 100644 --- a/src/gallium/auxiliary/vl/vl_deint_filter.c +++ b/src/gallium/auxiliary/vl/vl_deint_filter.c @@ -443,7 +443,6 @@ vl_deint_filter_render(struct vl_deint_filter *filter, /* prepare viewport */ memset(&viewport, 0, sizeof(viewport)); viewport.scale[2] = 1; - viewport.scale[3] = 1; /* prepare framebuffer */ memset(&fb_state, 0, sizeof(fb_state)); diff --git a/src/gallium/auxiliary/vl/vl_idct.c b/src/gallium/auxiliary/vl/vl_idct.c index 1212e5b1bf1..948a5a403d7 100644 --- a/src/gallium/auxiliary/vl/vl_idct.c +++ b/src/gallium/auxiliary/vl/vl_idct.c @@ -609,7 +609,6 @@ init_source(struct vl_idct *idct, struct vl_idct_buffer *buffer) buffer->viewport_mismatch.scale[0] = tex->width0; buffer->viewport_mismatch.scale[1] = tex->height0; buffer->viewport_mismatch.scale[2] = 1; - buffer->viewport_mismatch.scale[3] = 1; return true; } @@ -653,7 +652,6 @@ init_intermediate(struct vl_idct *idct, struct vl_idct_buffer *buffer) buffer->viewport.scale[0] = tex->width0; buffer->viewport.scale[1] = tex->height0; buffer->viewport.scale[2] = 1; - buffer->viewport.scale[3] = 1; return true; diff --git a/src/gallium/auxiliary/vl/vl_matrix_filter.c b/src/gallium/auxiliary/vl/vl_matrix_filter.c index 6d55116c8a2..52ce4540122 100644 --- a/src/gallium/auxiliary/vl/vl_matrix_filter.c +++ b/src/gallium/auxiliary/vl/vl_matrix_filter.c @@ -296,7 +296,6 @@ vl_matrix_filter_render(struct vl_matrix_filter *filter, viewport.scale[0] = dst->width; viewport.scale[1] = dst->height; viewport.scale[2] = 1; - viewport.scale[3] = 1; memset(&fb_state, 0, sizeof(fb_state)); fb_state.width = dst->width; diff --git a/src/gallium/auxiliary/vl/vl_mc.c b/src/gallium/auxiliary/vl/vl_mc.c index 11f12326c12..6c317bbe04a 100644 --- a/src/gallium/auxiliary/vl/vl_mc.c +++ b/src/gallium/auxiliary/vl/vl_mc.c @@ -554,11 +554,9 @@ vl_mc_init_buffer(struct vl_mc *renderer, struct vl_mc_buffer *buffer) assert(renderer && buffer); buffer->viewport.scale[2] = 1; - buffer->viewport.scale[3] = 1; buffer->viewport.translate[0] = 0; buffer->viewport.translate[1] = 0; buffer->viewport.translate[2] = 0; - buffer->viewport.translate[3] = 0; buffer->fb_state.nr_cbufs = 1; buffer->fb_state.zsbuf = NULL; diff --git a/src/gallium/auxiliary/vl/vl_median_filter.c b/src/gallium/auxiliary/vl/vl_median_filter.c index a79886f4a4b..aa9a6b26485 100644 --- a/src/gallium/auxiliary/vl/vl_median_filter.c +++ b/src/gallium/auxiliary/vl/vl_median_filter.c @@ -375,7 +375,6 @@ vl_median_filter_render(struct vl_median_filter *filter, viewport.scale[0] = dst->width; viewport.scale[1] = dst->height; viewport.scale[2] = 1; - viewport.scale[3] = 1; memset(&fb_state, 0, sizeof(fb_state)); fb_state.width = dst->width; diff --git a/src/gallium/auxiliary/vl/vl_zscan.c b/src/gallium/auxiliary/vl/vl_zscan.c index 2e094810d21..1c6cdd4f2c9 100644 --- a/src/gallium/auxiliary/vl/vl_zscan.c +++ b/src/gallium/auxiliary/vl/vl_zscan.c @@ -470,11 +470,9 @@ vl_zscan_init_buffer(struct vl_zscan *zscan, struct vl_zscan_buffer *buffer, buffer->viewport.scale[0] = dst->width; buffer->viewport.scale[1] = dst->height; buffer->viewport.scale[2] = 1; - buffer->viewport.scale[3] = 1; buffer->viewport.translate[0] = 0; buffer->viewport.translate[1] = 0; buffer->viewport.translate[2] = 0; - buffer->viewport.translate[3] = 0; buffer->fb_state.width = dst->width; buffer->fb_state.height = dst->height; |