X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fdrivers%2Fdri%2Fi965%2Fgen7_sf_state.c;h=b9838470c64997fc74d9d1e6fb944b26de40c2a5;hb=65dd4a255a16a0b5cf843ff1d4657fe346caf116;hp=5ebe6f293d0934f465708413d6d20f07ccbe2763;hpb=bf9bfe838eba116cb63dac9a8998da475e1bd98b;p=mesa.git diff --git a/src/mesa/drivers/dri/i965/gen7_sf_state.c b/src/mesa/drivers/dri/i965/gen7_sf_state.c index 5ebe6f293d0..b9838470c64 100644 --- a/src/mesa/drivers/dri/i965/gen7_sf_state.c +++ b/src/mesa/drivers/dri/i965/gen7_sf_state.c @@ -32,17 +32,15 @@ static void upload_sbe_state(struct brw_context *brw) { - struct intel_context *intel = &brw->intel; - struct gl_context *ctx = &intel->ctx; - /* BRW_NEW_FRAGMENT_PROGRAM */ - uint32_t num_outputs = _mesa_bitcount_64(brw->fragment_program->Base.InputsRead); - /* _NEW_LIGHT */ - bool shade_model_flat = ctx->Light.ShadeModel == GL_FLAT; - uint32_t dw1, dw10, dw11; + struct gl_context *ctx = &brw->ctx; + /* BRW_NEW_FS_PROG_DATA */ + uint32_t num_outputs = brw->wm.prog_data->num_varying_inputs; + uint32_t dw1; + uint32_t point_sprite_enables; + uint32_t flat_enables; int i; - int attr = 0, input_index = 0; - int urb_entry_read_offset = 1; - uint16_t attr_overrides[VARYING_SLOT_MAX]; + const int urb_entry_read_offset = BRW_SF_URB_ENTRY_READ_OFFSET; + uint16_t attr_overrides[16]; /* _NEW_BUFFERS */ bool render_to_fbo = _mesa_is_user_fbo(ctx->DrawBuffer); uint32_t point_sprite_origin; @@ -62,70 +60,15 @@ upload_sbe_state(struct brw_context *brw) } dw1 |= point_sprite_origin; - - dw10 = 0; - dw11 = 0; - - /* Create the mapping from the FS inputs we produce to the VS outputs - * they source from. - */ - uint32_t max_source_attr = 0; - for (; attr < VARYING_SLOT_MAX; attr++) { - enum glsl_interp_qualifier interp_qualifier = - brw->fragment_program->InterpQualifier[attr]; - bool is_gl_Color = attr == VARYING_SLOT_COL0 || attr == VARYING_SLOT_COL1; - - if (!(brw->fragment_program->Base.InputsRead & BITFIELD64_BIT(attr))) - continue; - - if (ctx->Point.PointSprite && - attr >= VARYING_SLOT_TEX0 && attr <= VARYING_SLOT_TEX7 && - ctx->Point.CoordReplace[attr - VARYING_SLOT_TEX0]) { - dw10 |= (1 << input_index); - } - - if (attr == VARYING_SLOT_PNTC) - dw10 |= (1 << input_index); - - /* flat shading */ - if (interp_qualifier == INTERP_QUALIFIER_FLAT || - (shade_model_flat && is_gl_Color && - interp_qualifier == INTERP_QUALIFIER_NONE)) - dw11 |= (1 << input_index); - - /* The hardware can only do the overrides on 16 overrides at a - * time, and the other up to 16 have to be lined up so that the - * input index = the output index. We'll need to do some - * tweaking to make sure that's the case. - */ - assert(input_index < 16 || attr == input_index); - - /* BRW_NEW_VUE_MAP_GEOM_OUT | _NEW_LIGHT | _NEW_PROGRAM */ - attr_overrides[input_index++] = - get_attr_override(&brw->vue_map_geom_out, - urb_entry_read_offset, attr, - ctx->VertexProgram._TwoSideEnabled, - &max_source_attr); - } - - /* From the Ivy Bridge PRM, Volume 2, Part 1, documentation for - * 3DSTATE_SBE DWord 1 bits 15:11, "Vertex URB Entry Read Length": - * - * "This field should be set to the minimum length required to read the - * maximum source attribute. The maximum source attribute is indicated - * by the maximum value of the enabled Attribute # Source Attribute if - * Attribute Swizzle Enable is set, Number of Output Attributes-1 if - * enable is not set. - * - * read_length = ceiling((max_source_attr + 1) / 2)" + /* BRW_NEW_VUE_MAP_GEOM_OUT | BRW_NEW_FRAGMENT_PROGRAM + * _NEW_POINT | _NEW_LIGHT | _NEW_PROGRAM | BRW_NEW_FS_PROG_DATA */ - uint32_t urb_entry_read_length = ALIGN(max_source_attr + 1, 2) / 2; + uint32_t urb_entry_read_length; + calculate_attr_overrides(brw, attr_overrides, &point_sprite_enables, + &flat_enables, &urb_entry_read_length); dw1 |= urb_entry_read_length << GEN7_SBE_URB_ENTRY_READ_LENGTH_SHIFT | urb_entry_read_offset << GEN7_SBE_URB_ENTRY_READ_OFFSET_SHIFT; - for (; input_index < VARYING_SLOT_MAX; input_index++) - attr_overrides[input_index] = 0; - BEGIN_BATCH(14); OUT_BATCH(_3DSTATE_SBE << 16 | (14 - 2)); OUT_BATCH(dw1); @@ -135,8 +78,8 @@ upload_sbe_state(struct brw_context *brw) OUT_BATCH(attr_overrides[i * 2] | attr_overrides[i * 2 + 1] << 16); } - OUT_BATCH(dw10); /* point sprite texcoord bitmask */ - OUT_BATCH(dw11); /* constant interp bitmask */ + OUT_BATCH(point_sprite_enables); /* dw10 */ + OUT_BATCH(flat_enables); OUT_BATCH(0); /* wrapshortest enables 0-7 */ OUT_BATCH(0); /* wrapshortest enables 8-15 */ ADVANCE_BATCH(); @@ -144,13 +87,16 @@ upload_sbe_state(struct brw_context *brw) const struct brw_tracked_state gen7_sbe_state = { .dirty = { - .mesa = (_NEW_BUFFERS | - _NEW_LIGHT | - _NEW_POINT | - _NEW_PROGRAM), - .brw = (BRW_NEW_CONTEXT | - BRW_NEW_FRAGMENT_PROGRAM | - BRW_NEW_VUE_MAP_GEOM_OUT) + .mesa = _NEW_BUFFERS | + _NEW_LIGHT | + _NEW_POINT | + _NEW_PROGRAM, + .brw = BRW_NEW_CONTEXT | + BRW_NEW_FRAGMENT_PROGRAM | + BRW_NEW_FS_PROG_DATA | + BRW_NEW_GEOMETRY_PROGRAM | + BRW_NEW_PRIMITIVE | + BRW_NEW_VUE_MAP_GEOM_OUT, }, .emit = upload_sbe_state, }; @@ -158,16 +104,17 @@ const struct brw_tracked_state gen7_sbe_state = { static void upload_sf_state(struct brw_context *brw) { - struct intel_context *intel = &brw->intel; - struct gl_context *ctx = &intel->ctx; + struct gl_context *ctx = &brw->ctx; uint32_t dw1, dw2, dw3; float point_size; /* _NEW_BUFFERS */ - bool render_to_fbo = _mesa_is_user_fbo(brw->intel.ctx.DrawBuffer); + bool render_to_fbo = _mesa_is_user_fbo(ctx->DrawBuffer); bool multisampled_fbo = ctx->DrawBuffer->Visual.samples > 1; - dw1 = GEN6_SF_STATISTICS_ENABLE | - GEN6_SF_VIEWPORT_TRANSFORM_ENABLE; + dw1 = GEN6_SF_STATISTICS_ENABLE; + + if (brw->sf.viewport_transform_enable) + dw1 |= GEN6_SF_VIEWPORT_TRANSFORM_ENABLE; /* _NEW_BUFFERS */ dw1 |= (brw_depthbuffer_format(brw) << GEN7_SF_DEPTH_BUFFER_SURFACE_FORMAT_SHIFT); @@ -199,8 +146,7 @@ upload_sf_state(struct brw_context *brw) break; default: - assert(0); - break; + unreachable("not reached"); } switch (ctx->Polygon.BackMode) { @@ -217,8 +163,7 @@ upload_sf_state(struct brw_context *brw) break; default: - assert(0); - break; + unreachable("not reached"); } dw2 = 0; @@ -235,20 +180,20 @@ upload_sf_state(struct brw_context *brw) dw2 |= GEN6_SF_CULL_BOTH; break; default: - assert(0); - break; + unreachable("not reached"); } } else { dw2 |= GEN6_SF_CULL_NONE; } /* _NEW_SCISSOR */ - if (ctx->Scissor.Enabled) + if (ctx->Scissor.EnableFlags) dw2 |= GEN6_SF_SCISSOR_ENABLE; /* _NEW_LINE */ { - uint32_t line_width_u3_7 = U_FIXED(CLAMP(ctx->Line.Width, 0.0, 7.99), 7); + uint32_t line_width_u3_7 = + U_FIXED(CLAMP(ctx->Line.Width, 0.0, ctx->Const.MaxLineWidth), 7); /* TODO: line width of 0 is not allowed when MSAA enabled */ if (line_width_u3_7 == 0) line_width_u3_7 = 1; @@ -258,7 +203,7 @@ upload_sf_state(struct brw_context *brw) dw2 |= GEN6_SF_LINE_AA_ENABLE; dw2 |= GEN6_SF_LINE_END_CAP_WIDTH_1_0; } - if (ctx->Line.StippleFlag && intel->is_haswell) { + if (ctx->Line.StippleFlag && brw->is_haswell) { dw2 |= HSW_SF_LINE_STIPPLE_ENABLE; } /* _NEW_MULTISAMPLE */ @@ -303,16 +248,15 @@ upload_sf_state(struct brw_context *brw) const struct brw_tracked_state gen7_sf_state = { .dirty = { - .mesa = (_NEW_LIGHT | - _NEW_PROGRAM | - _NEW_POLYGON | - _NEW_LINE | - _NEW_SCISSOR | - _NEW_BUFFERS | - _NEW_POINT | - _NEW_MULTISAMPLE), + .mesa = _NEW_BUFFERS | + _NEW_LIGHT | + _NEW_LINE | + _NEW_MULTISAMPLE | + _NEW_POINT | + _NEW_POLYGON | + _NEW_PROGRAM | + _NEW_SCISSOR, .brw = BRW_NEW_CONTEXT, - .cache = CACHE_NEW_VS_PROG }, .emit = upload_sf_state, };