X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fdrivers%2Fdri%2Fi965%2Fgen6_viewport_state.c;h=ad1e72d0a501132d600c41c75ff908d53d64f364;hb=81faead818a0b2fde131df019f5dfb0baef49273;hp=c46dc3e3c11c1035c034b320358634591f6cb26d;hpb=d67c08319fda7d0f2df98d60b64c8cc2f3e06c44;p=mesa.git diff --git a/src/mesa/drivers/dri/i965/gen6_viewport_state.c b/src/mesa/drivers/dri/i965/gen6_viewport_state.c index c46dc3e3c11..ad1e72d0a50 100644 --- a/src/mesa/drivers/dri/i965/gen6_viewport_state.c +++ b/src/mesa/drivers/dri/i965/gen6_viewport_state.c @@ -29,106 +29,135 @@ #include "brw_state.h" #include "brw_defines.h" #include "intel_batchbuffer.h" +#include "main/fbobject.h" +#include "main/framebuffer.h" +#include "main/viewport.h" /* The clip VP defines the guardband region where expensive clipping is skipped * and fragments are allowed to be generated and clipped out cheaply by the SF. - * - * By setting it to NDC bounds of [-1,1], we don't do GB clipping. It's - * supposed to cause seams to become visible in apps due to shared edges taking - * different clip/no clip paths depending on whether the rest of the prim ends - * up in the guardband or not. */ static void -prepare_clip_vp(struct brw_context *brw) +gen6_upload_clip_vp(struct brw_context *brw) { + struct gl_context *ctx = &brw->ctx; struct brw_clipper_viewport *vp; - vp = brw_state_batch(brw, sizeof(*vp), 32, &brw->clip.vp_offset); + /* BRW_NEW_VIEWPORT_COUNT */ + const unsigned viewport_count = brw->clip.viewport_count; + + vp = brw_state_batch(brw, AUB_TRACE_CLIP_VP_STATE, + sizeof(*vp) * viewport_count, 32, &brw->clip.vp_offset); - vp->xmin = -1.0; - vp->xmax = 1.0; - vp->ymin = -1.0; - vp->ymax = 1.0; + for (unsigned i = 0; i < viewport_count; i++) { + /* 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_post_clamp_delta = 8192; + float gbx = maximum_post_clamp_delta / ctx->ViewportArray[i].Width; + float gby = maximum_post_clamp_delta / ctx->ViewportArray[i].Height; - brw->state.dirty.cache |= CACHE_NEW_CLIP_VP; + vp[i].xmin = -gbx; + vp[i].xmax = gbx; + vp[i].ymin = -gby; + vp[i].ymax = gby; + } + + brw->ctx.NewDriverState |= BRW_NEW_CLIP_VP; } const struct brw_tracked_state gen6_clip_vp = { .dirty = { - .mesa = 0, - .brw = BRW_NEW_BATCH, - .cache = 0, + .mesa = _NEW_VIEWPORT, + .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | + BRW_NEW_VIEWPORT_COUNT, }, - .prepare = prepare_clip_vp, + .emit = gen6_upload_clip_vp, }; static void -prepare_sf_vp(struct brw_context *brw) +gen6_upload_sf_vp(struct brw_context *brw) { - struct gl_context *ctx = &brw->intel.ctx; - const GLfloat depth_scale = 1.0F / ctx->DrawBuffer->_DepthMaxF; - struct brw_sf_viewport *sfv; + struct gl_context *ctx = &brw->ctx; + struct gen6_sf_viewport *sfv; GLfloat y_scale, y_bias; - const GLboolean render_to_fbo = (ctx->DrawBuffer->Name != 0); - const GLfloat *v = ctx->Viewport._WindowMap.m; + const bool render_to_fbo = _mesa_is_user_fbo(ctx->DrawBuffer); - sfv = brw_state_batch(brw, sizeof(*sfv), 32, &brw->sf.vp_offset); - memset(sfv, 0, sizeof(*sfv)); + /* BRW_NEW_VIEWPORT_COUNT */ + const unsigned viewport_count = brw->clip.viewport_count; + + sfv = brw_state_batch(brw, AUB_TRACE_SF_VP_STATE, + sizeof(*sfv) * viewport_count, + 32, &brw->sf.vp_offset); + memset(sfv, 0, sizeof(*sfv) * viewport_count); /* _NEW_BUFFERS */ if (render_to_fbo) { y_scale = 1.0; - y_bias = 0; + y_bias = 0.0; } else { y_scale = -1.0; - y_bias = ctx->DrawBuffer->Height; + y_bias = (float)_mesa_geometric_height(ctx->DrawBuffer); } - /* _NEW_VIEWPORT */ - sfv->viewport.m00 = v[MAT_SX]; - sfv->viewport.m11 = v[MAT_SY] * y_scale; - sfv->viewport.m22 = v[MAT_SZ] * depth_scale; - sfv->viewport.m30 = v[MAT_TX]; - sfv->viewport.m31 = v[MAT_TY] * y_scale + y_bias; - sfv->viewport.m32 = v[MAT_TZ] * depth_scale; + for (unsigned i = 0; i < viewport_count; i++) { + float scale[3], translate[3]; + + /* _NEW_VIEWPORT */ + _mesa_get_viewport_xform(ctx, i, scale, translate); + sfv[i].m00 = scale[0]; + sfv[i].m11 = scale[1] * y_scale; + sfv[i].m22 = scale[2]; + sfv[i].m30 = translate[0]; + sfv[i].m31 = translate[1] * y_scale + y_bias; + sfv[i].m32 = translate[2]; - brw->state.dirty.cache |= CACHE_NEW_SF_VP; + } + + brw->ctx.NewDriverState |= BRW_NEW_SF_VP; } const struct brw_tracked_state gen6_sf_vp = { .dirty = { - .mesa = _NEW_VIEWPORT | _NEW_BUFFERS, - .brw = BRW_NEW_BATCH, - .cache = 0, + .mesa = _NEW_BUFFERS | + _NEW_VIEWPORT, + .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | + BRW_NEW_VIEWPORT_COUNT, }, - .prepare = prepare_sf_vp, + .emit = gen6_upload_sf_vp, }; static void upload_viewport_state_pointers(struct brw_context *brw) { - struct intel_context *intel = &brw->intel; - BEGIN_BATCH(4); OUT_BATCH(_3DSTATE_VIEWPORT_STATE_POINTERS << 16 | (4 - 2) | GEN6_CC_VIEWPORT_MODIFY | GEN6_SF_VIEWPORT_MODIFY | GEN6_CLIP_VIEWPORT_MODIFY); - OUT_RELOC(intel->batch.bo, I915_GEM_DOMAIN_INSTRUCTION, 0, - brw->clip.vp_offset); - OUT_RELOC(intel->batch.bo, I915_GEM_DOMAIN_INSTRUCTION, 0, - brw->sf.vp_offset); - OUT_RELOC(intel->batch.bo, I915_GEM_DOMAIN_INSTRUCTION, 0, - brw->cc.vp_offset); + OUT_BATCH(brw->clip.vp_offset); + OUT_BATCH(brw->sf.vp_offset); + OUT_BATCH(brw->cc.vp_offset); ADVANCE_BATCH(); } const struct brw_tracked_state gen6_viewport_state = { .dirty = { .mesa = 0, - .brw = BRW_NEW_BATCH, - .cache = (CACHE_NEW_CLIP_VP | - CACHE_NEW_SF_VP | - CACHE_NEW_CC_VP) + .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | + BRW_NEW_CC_VP | + BRW_NEW_CLIP_VP | + BRW_NEW_SF_VP | + BRW_NEW_STATE_BASE_ADDRESS, }, .emit = upload_viewport_state_pointers, };