X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fdrivers%2Fdri%2Fi965%2Fbrw_clip_state.c;h=39c149c976220a9626ac291d12f65e1a12cb3da1;hb=ed65e6ef49e17e9cae93a8f98e2968346de2bc6e;hp=31fbadf5ef2f134ab2563f72988138f641b47174;hpb=ed24e19070b7dff12670151b2d184f31c845ccae;p=mesa.git diff --git a/src/mesa/drivers/dri/i965/brw_clip_state.c b/src/mesa/drivers/dri/i965/brw_clip_state.c index 31fbadf5ef2..39c149c9762 100644 --- a/src/mesa/drivers/dri/i965/brw_clip_state.c +++ b/src/mesa/drivers/dri/i965/brw_clip_state.c @@ -1,8 +1,8 @@ /* Copyright (C) Intel Corp. 2006. All Rights Reserved. - Intel funded Tungsten Graphics (http://www.tungstengraphics.com) to + Intel funded Tungsten Graphics to develop this 3D driver. - + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including @@ -10,11 +10,11 @@ distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - + The above copyright notice and this permission notice (including the next paragraph) shall be included in all copies or substantial portions of the Software. - + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. @@ -22,29 +22,55 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - + **********************************************************************/ /* * Authors: - * Keith Whitwell + * Keith Whitwell */ #include "brw_context.h" #include "brw_state.h" #include "brw_defines.h" +#include "main/framebuffer.h" + +static void +upload_clip_vp(struct brw_context *brw) +{ + struct gl_context *ctx = &brw->ctx; + struct brw_clipper_viewport *vp; + + vp = brw_state_batch(brw, AUB_TRACE_CLIP_VP_STATE, + sizeof(*vp), 32, &brw->clip.vp_offset); + + const float maximum_post_clamp_delta = 4096; + float gbx = maximum_post_clamp_delta / ctx->ViewportArray[0].Width; + float gby = maximum_post_clamp_delta / ctx->ViewportArray[0].Height; + + vp->xmin = -gbx; + vp->xmax = gbx; + vp->ymin = -gby; + vp->ymax = gby; +} static void -brw_prepare_clip_unit(struct brw_context *brw) +brw_upload_clip_unit(struct brw_context *brw) { - struct intel_context *intel = &brw->intel; - struct gl_context *ctx = &intel->ctx; + struct gl_context *ctx = &brw->ctx; struct brw_clip_unit_state *clip; + /* _NEW_BUFFERS */ + const struct gl_framebuffer *fb = ctx->DrawBuffer; + const float fb_width = (float)_mesa_geometric_width(fb); + const float fb_height = (float)_mesa_geometric_height(fb); + + upload_clip_vp(brw); + clip = brw_state_batch(brw, AUB_TRACE_CLIP_STATE, sizeof(*clip), 32, &brw->clip.state_offset); memset(clip, 0, sizeof(*clip)); - /* BRW_NEW_PROGRAM_CACHE | CACHE_NEW_CLIP_PROG */ + /* BRW_NEW_PROGRAM_CACHE | BRW_NEW_CLIP_PROG_DATA */ clip->thread0.grf_reg_count = (ALIGN(brw->clip.prog_data->total_grf, 16) / 16 - 1); clip->thread0.kernel_start_pointer = @@ -76,11 +102,11 @@ brw_prepare_clip_unit(struct brw_context *brw) * even number. */ assert(brw->urb.nr_clip_entries % 2 == 0); - + /* Although up to 16 concurrent Clip threads are allowed on Ironlake, * only 2 threads can output VUEs at a time. */ - if (intel->gen == 5) + if (brw->gen == 5) clip->thread4.max_threads = 16 - 1; else clip->thread4.max_threads = 2 - 1; @@ -89,43 +115,69 @@ brw_prepare_clip_unit(struct brw_context *brw) clip->thread4.max_threads = 1 - 1; } - if (unlikely(INTEL_DEBUG & DEBUG_SINGLE_THREAD)) - clip->thread4.max_threads = 0; - if (unlikely(INTEL_DEBUG & DEBUG_STATS)) clip->thread4.stats_enable = 1; - clip->clip5.userclip_enable_flags = 0x7f; + /* _NEW_TRANSFORM */ + if (brw->gen == 5 || brw->is_g4x) + clip->clip5.userclip_enable_flags = ctx->Transform.ClipPlanesEnabled; + else + /* Up to 6 actual clip flags, plus the 7th for negative RHW workaround. */ + clip->clip5.userclip_enable_flags = (ctx->Transform.ClipPlanesEnabled & 0x3f) | 0x40; + clip->clip5.userclip_must_clip = 1; - clip->clip5.guard_band_enable = 0; - /* _NEW_TRANSOFORM */ + + /* enable guardband clipping if we can */ + if (ctx->ViewportArray[0].X == 0 && + ctx->ViewportArray[0].Y == 0 && + ctx->ViewportArray[0].Width == fb_width && + ctx->ViewportArray[0].Height == fb_height) + { + clip->clip5.guard_band_enable = 1; + clip->clip6.clipper_viewport_state_ptr = + (brw->batch.bo->offset64 + brw->clip.vp_offset) >> 5; + + /* emit clip viewport relocation */ + drm_intel_bo_emit_reloc(brw->batch.bo, + (brw->clip.state_offset + + offsetof(struct brw_clip_unit_state, clip6)), + brw->batch.bo, brw->clip.vp_offset, + I915_GEM_DOMAIN_INSTRUCTION, 0); + } + + /* _NEW_TRANSFORM */ if (!ctx->Transform.DepthClamp) clip->clip5.viewport_z_clip_enable = 1; clip->clip5.viewport_xy_clip_enable = 1; clip->clip5.vertex_position_space = BRW_CLIP_NDCSPACE; - clip->clip5.api_mode = BRW_CLIP_API_OGL; + if (ctx->Transform.ClipDepthMode == GL_ZERO_TO_ONE) + clip->clip5.api_mode = BRW_CLIP_API_DX; + else + clip->clip5.api_mode = BRW_CLIP_API_OGL; clip->clip5.clip_mode = brw->clip.prog_data->clip_mode; - if (intel->is_g4x) + if (brw->is_g4x) clip->clip5.negative_w_clip_test = 1; - clip->clip6.clipper_viewport_state_ptr = 0; clip->viewport_xmin = -1; clip->viewport_xmax = 1; clip->viewport_ymin = -1; clip->viewport_ymax = 1; - brw->state.dirty.cache |= CACHE_NEW_CLIP_UNIT; + brw->ctx.NewDriverState |= BRW_NEW_GEN4_UNIT_STATE; } const struct brw_tracked_state brw_clip_unit = { .dirty = { - .mesa = _NEW_TRANSFORM, - .brw = (BRW_NEW_BATCH | - BRW_NEW_PROGRAM_CACHE | - BRW_NEW_CURBE_OFFSETS | - BRW_NEW_URB_FENCE), - .cache = CACHE_NEW_CLIP_PROG + .mesa = _NEW_BUFFERS | + _NEW_TRANSFORM | + _NEW_VIEWPORT, + .brw = BRW_NEW_BATCH | + BRW_NEW_BLORP | + BRW_NEW_CLIP_PROG_DATA | + BRW_NEW_CURBE_OFFSETS | + BRW_NEW_PROGRAM_CACHE | + BRW_NEW_URB_FENCE, }, - .prepare = brw_prepare_clip_unit, + .emit = brw_upload_clip_unit, };