KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

swr: calculate viewport width/height based on the scale 

The former calculations were for min/max y. The width/height don't take
translate into account.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Tim Rowley <timothy.o.rowley@intel.com>
This commit is contained in:
Ilia Mirkin 2016-11-18 20:19:24 -05:00
parent c3dd5b2e3f
commit 807bc6ea9e
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/gallium/drivers/swr/swr_state.cpp
View File

@ -976,9 +976,9 @@ swr_update_derived(struct pipe_context *pipe,
SWR_VIEWPORT_MATRICES *vpm = &ctx->derived.vpm;
vp->x = state->translate[0] - state->scale[0];
vp->width = state->translate[0] + state->scale[0];
vp->width = 2 * state->scale[0];
vp->y = state->translate[1] - fabs(state->scale[1]);
vp->height = state->translate[1] + fabs(state->scale[1]);
vp->height = 2 * fabs(state->scale[1]);
util_viewport_zmin_zmax(state, rasterizer->clip_halfz,
&vp->minZ, &vp->maxZ);
@ -991,10 +991,16 @@ swr_update_derived(struct pipe_context *pipe,
/* Now that the matrix is calculated, clip the view coords to screen
* size. OpenGL allows for -ve x,y in the viewport. */
vp->x = std::max(vp->x, 0.0f);
vp->y = std::max(vp->y, 0.0f);
vp->width = std::min(vp->width, (float)fb->width);
vp->height = std::min(vp->height, (float)fb->height);
if (vp->x < 0.0f) {
vp->width += vp->x;
vp->x = 0.0f;
}
if (vp->y < 0.0f) {
vp->height += vp->y;
vp->y = 0.0f;
}
vp->width = std::min(vp->width, (float)fb->width - vp->x);
vp->height = std::min(vp->height, (float)fb->height - vp->y);
SwrSetViewports(ctx->swrContext, 1, vp, vpm);
}