Set viewport state so viewport matches window dims.

trivial/readpixels.c works again.

1 files changed, 17 insertions, 0 deletions

diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c
index 108304f5e2..d3f060e691 100644
--- a/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -364,6 +364,22 @@ draw_textured_quad(GLcontext *ctx, GLint x, GLint y, GLfloat z,
       pipe->set_sampler_state(pipe, unit, &sampler);
    }
 
+   /* viewport state: viewport matching window dims */
+   {
+      const float width = ctx->DrawBuffer->Width;
+      const float height = ctx->DrawBuffer->Height;
+      struct pipe_viewport_state vp;
+      vp.scale[0] =  0.5 * width;
+      vp.scale[1] = -0.5 * height;
+      vp.scale[2] = 0.5;
+      vp.scale[3] = 1.0;
+      vp.translate[0] = 0.5 * width;
+      vp.translate[1] = 0.5 * height;
+      vp.translate[2] = 0.5;
+      vp.translate[3] = 0.0;
+      pipe->set_viewport_state(pipe, &vp);
+   }
+
    /* mipmap tree state: */
    {
       mt = make_mipmap_tree(ctx->st, width, height, format, type,
@@ -389,6 +405,7 @@ draw_textured_quad(GLcontext *ctx, GLint x, GLint y, GLfloat z,
    pipe->set_vs_state(pipe, &ctx->st->state.vs);
    pipe->set_texture_state(pipe, unit, ctx->st->state.texture[unit]);
    pipe->set_sampler_state(pipe, unit, &ctx->st->state.sampler[unit]);
+   pipe->set_viewport_state(pipe, &ctx->st->state.viewport);
 
    free_mipmap_tree(pipe, mt);
 }