diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-21 08:45:16 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-21 08:45:16 +0100 |
| commit | 6e90a0e707aa6d28622f654078f25066bef4dc80 (patch) | |
| tree | cc95d3e984b2fc4503b5fc8ae731518a8c34fe7c /mesalib/src/mesa/state_tracker | |
| parent | f75616ac3e99a6bb814803c823cb34533b9fc328 (diff) | |
| parent | bb953a87489963f63e65c797a1f2837382ff7808 (diff) | |
| download | vcxsrv-6e90a0e707aa6d28622f654078f25066bef4dc80.tar.gz vcxsrv-6e90a0e707aa6d28622f654078f25066bef4dc80.tar.bz2 vcxsrv-6e90a0e707aa6d28622f654078f25066bef4dc80.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver mesa git update 21 nov 2013
Diffstat (limited to 'mesalib/src/mesa/state_tracker')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_cb_feedback.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_cb_feedback.c b/mesalib/src/mesa/state_tracker/st_cb_feedback.c index d2e4346b7..34a16ccf9 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_feedback.c +++ b/mesalib/src/mesa/state_tracker/st_cb_feedback.c @@ -85,9 +85,11 @@ feedback_vertex(struct gl_context *ctx, const struct draw_context *draw, const GLfloat *color, *texcoord; GLuint slot; - /* Recall that Y=0=Top of window for Gallium wincoords */ win[0] = v->data[0][0]; - win[1] = ctx->DrawBuffer->Height - v->data[0][1]; + if (st_fb_orientation(ctx->DrawBuffer) == Y_0_TOP) + win[1] = ctx->DrawBuffer->Height - v->data[0][1]; + else + win[1] = v->data[0][1]; win[2] = v->data[0][2]; win[3] = 1.0F / v->data[0][3]; |