fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 11:28:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

i965: Set all the supported viewports for GEN7

Browse source 
Currently MaxViewports is still 1, so this won't affect any change.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Ian Romanick 2013-11-05 22:50:02 -08:00
parent fceb8b55c0
commit d989c4b134
3 changed files with 48 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/mesa/drivers/dri/i965/brw_cc.c
View file

@ -45,16 +45,21 @@ brw_upload_cc_vp(struct brw_context *brw)
struct brw_cc_viewport *ccv;
ccv = brw_state_batch(brw, AUB_TRACE_CC_VP_STATE,
sizeof(*ccv), 32, &brw->cc.vp_offset);
sizeof(*ccv) * ctx->Const.MaxViewports, 32,
&brw->cc.vp_offset);
/* _NEW_TRANSFORM */
if (ctx->Transform.DepthClamp) {
/* _NEW_VIEWPORT */
ccv->min_depth = MIN2(ctx->ViewportArray[0].Near, ctx->ViewportArray[0].Far);
ccv->max_depth = MAX2(ctx->ViewportArray[0].Near, ctx->ViewportArray[0].Far);
} else {
ccv->min_depth = 0.0;
ccv->max_depth = 1.0;
for (unsigned i = 0; i < ctx->Const.MaxViewports; i++) {
if (ctx->Transform.DepthClamp) {
/* _NEW_VIEWPORT */
ccv[i].min_depth = MIN2(ctx->ViewportArray[i].Near,
ctx->ViewportArray[i].Far);
ccv[i].max_depth = MAX2(ctx->ViewportArray[i].Near,
ctx->ViewportArray[i].Far);
} else {
ccv[i].min_depth = 0.0;
ccv[i].max_depth = 1.0;
}
}
brw->state.dirty.cache |= CACHE_NEW_CC_VP;

1
src/mesa/drivers/dri/i965/brw_defines.h
View file

@ -1428,6 +1428,7 @@ enum brw_message_target {
# define GEN6_CC_VIEWPORT_MODIFY (1 << 12)
# define GEN6_SF_VIEWPORT_MODIFY (1 << 11)
# define GEN6_CLIP_VIEWPORT_MODIFY (1 << 10)
# define GEN7_NUM_VIEWPORTS 16
#define _3DSTATE_VIEWPORT_STATE_POINTERS_CC 0x7823 /* GEN7+ */
#define _3DSTATE_VIEWPORT_STATE_POINTERS_SF_CL 0x7821 /* GEN7+ */

63
src/mesa/drivers/dri/i965/gen7_viewport_state.c
View file

@ -34,34 +34,14 @@ gen7_upload_sf_clip_viewport(struct brw_context *brw)
const GLfloat depth_scale = 1.0F / ctx->DrawBuffer->_DepthMaxF;
GLfloat y_scale, y_bias;
const bool render_to_fbo = _mesa_is_user_fbo(ctx->DrawBuffer);
const GLfloat *v = ctx->ViewportArray[0]._WindowMap.m;
struct gen7_sf_clip_viewport *vp;
vp = brw_state_batch(brw, AUB_TRACE_SF_VP_STATE,
sizeof(*vp), 64, &brw->sf.vp_offset);
sizeof(*vp) * ctx->Const.MaxViewports, 64,
&brw->sf.vp_offset);
/* Also assign to clip.vp_offset in case something uses it. */
brw->clip.vp_offset = brw->sf.vp_offset;
/* According to the "Vertex X,Y Clamping and Quantization" section of the
* Strips and Fans documentation, objects must not have a screen-space
* extents of over 8192 pixels, or they may be mis-rasterized. The maximum
* screen space coordinates of a small object may larger, but we have no
* way to enforce the object size other than through clipping.
*
* If you're surprised that we set clip to -gbx to +gbx and it seems like
* we'll end up with 16384 wide, note that for a 8192-wide render target,
* we'll end up with a normal (-1, 1) clip volume that just covers the
* drawable.
*/
const float maximum_guardband_extent = 8192;
float gbx = maximum_guardband_extent / ctx->ViewportArray[0].Width;
float gby = maximum_guardband_extent / ctx->ViewportArray[0].Height;
vp->guardband.xmin = -gbx;
vp->guardband.xmax = gbx;
vp->guardband.ymin = -gby;
vp->guardband.ymax = gby;
/* _NEW_BUFFERS */
if (render_to_fbo) {
y_scale = 1.0;
@ -71,13 +51,38 @@ gen7_upload_sf_clip_viewport(struct brw_context *brw)
y_bias = ctx->DrawBuffer->Height;
}
/* _NEW_VIEWPORT */
vp->viewport.m00 = v[MAT_SX];
vp->viewport.m11 = v[MAT_SY] * y_scale;
vp->viewport.m22 = v[MAT_SZ] * depth_scale;
vp->viewport.m30 = v[MAT_TX];
vp->viewport.m31 = v[MAT_TY] * y_scale + y_bias;
vp->viewport.m32 = v[MAT_TZ] * depth_scale;
for (unsigned i = 0; i < ctx->Const.MaxViewports; i++) {
const GLfloat *const v = ctx->ViewportArray[i]._WindowMap.m;
/* According to the "Vertex X,Y Clamping and Quantization" section of
* the Strips and Fans documentation, objects must not have a
* screen-space extents of over 8192 pixels, or they may be
* mis-rasterized. The maximum screen space coordinates of a small
* object may larger, but we have no way to enforce the object size
* other than through clipping.
*
* If you're surprised that we set clip to -gbx to +gbx and it seems
* like we'll end up with 16384 wide, note that for a 8192-wide render
* target, we'll end up with a normal (-1, 1) clip volume that just
* covers the drawable.
*/
const float maximum_guardband_extent = 8192;
const float gbx = maximum_guardband_extent / ctx->ViewportArray[i].Width;
const float gby = maximum_guardband_extent / ctx->ViewportArray[i].Height;
vp[i].guardband.xmin = -gbx;
vp[i].guardband.xmax = gbx;
vp[i].guardband.ymin = -gby;
vp[i].guardband.ymax = gby;
/* _NEW_VIEWPORT */
vp[i].viewport.m00 = v[MAT_SX];
vp[i].viewport.m11 = v[MAT_SY] * y_scale;
vp[i].viewport.m22 = v[MAT_SZ] * depth_scale;
vp[i].viewport.m30 = v[MAT_TX];
vp[i].viewport.m31 = v[MAT_TY] * y_scale + y_bias;
vp[i].viewport.m32 = v[MAT_TZ] * depth_scale;
}
BEGIN_BATCH(2);
OUT_BATCH(_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CL << 16 | (2 - 2));