diff options
author | Kenneth Graunke <[email protected]> | 2011-01-05 01:21:06 -0800 |
---|---|---|
committer | Kenneth Graunke <[email protected]> | 2011-05-17 23:32:59 -0700 |
commit | 7d608d0c331c101088273655708965fb9f1be56e (patch) | |
tree | 878d57872e640cb0c460a39ff28a702d8f03907c | |
parent | 3dc4bc1f78db876d2dcb76153ecf9992fcce73e4 (diff) |
i965: Initial Ivybridge SF/SBE state setup.
Copied from gen6_sf_state.c.
The main change from Sandybridge seems to be that 3DSTATE_SF was split
into two separate state packet commands: 3DSTATE_SF and 3DSTATE_SBE
("setup backend"). The bit-offsets are even the same - only the DWords
numbers have shuffled around a bit.
Signed-off-by: Kenneth Graunke <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
-rw-r--r-- | src/mesa/drivers/dri/i965/Makefile | 1 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_defines.h | 23 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_state.h | 2 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_state_upload.c | 3 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/gen7_sf_state.c | 264 |
5 files changed, 291 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/Makefile b/src/mesa/drivers/dri/i965/Makefile index a1bbc962dee..bcfa01249ab 100644 --- a/src/mesa/drivers/dri/i965/Makefile +++ b/src/mesa/drivers/dri/i965/Makefile @@ -97,6 +97,7 @@ DRIVER_SOURCES = \ gen6_viewport_state.c \ gen6_vs_state.c \ gen6_wm_state.c \ + gen7_sf_state.c \ gen7_urb.c C_SOURCES = \ diff --git a/src/mesa/drivers/dri/i965/brw_defines.h b/src/mesa/drivers/dri/i965/brw_defines.h index 8135b3909f0..4dafc28b57a 100644 --- a/src/mesa/drivers/dri/i965/brw_defines.h +++ b/src/mesa/drivers/dri/i965/brw_defines.h @@ -966,7 +966,7 @@ # define GEN6_CLIP_FORCE_ZERO_RTAINDEX (1 << 5) #define _3DSTATE_SF 0x7813 /* GEN6+ */ -/* DW1 */ +/* DW1 (for gen6) */ # define GEN6_SF_NUM_OUTPUTS_SHIFT 22 # define GEN6_SF_SWIZZLE_ENABLE (1 << 21) # define GEN6_SF_POINT_SPRITE_LOWERLEFT (1 << 20) @@ -1042,6 +1042,27 @@ /* DW18: attr 0-7 wrap shortest enables */ /* DW19: attr 8-16 wrap shortest enables */ +/* On GEN7, many fields of 3DSTATE_SF were split out into a new command: + * 3DSTATE_SBE. The remaining fields live in different DWords, but retain + * the same bit-offset. The only new field: + */ +/* GEN7/DW1: */ +# define GEN7_SF_DEPTH_BUFFER_SURFACE_FORMAT_SHIFT 12 + +#define _3DSTATE_SBE 0x781F /* GEN7+ */ +/* DW1 */ +# define GEN7_SBE_SWIZZLE_CONTROL_MODE (1 << 28) +# define GEN7_SBE_NUM_OUTPUTS_SHIFT 22 +# define GEN7_SBE_SWIZZLE_ENABLE (1 << 21) +# define GEN7_SBE_POINT_SPRITE_LOWERLEFT (1 << 20) +# define GEN7_SBE_URB_ENTRY_READ_LENGTH_SHIFT 11 +# define GEN7_SBE_URB_ENTRY_READ_OFFSET_SHIFT 4 +/* DW2-9: Attribute setup (same as DW8-15 of gen6 _3DSTATE_SF) */ +/* DW10: Point sprite texture coordinate enables */ +/* DW11: Constant interpolation enables */ +/* DW12: attr 0-7 wrap shortest enables */ +/* DW13: attr 8-16 wrap shortest enables */ + #define _3DSTATE_WM 0x7814 /* GEN6+ */ /* DW1: kernel pointer */ /* DW2 */ diff --git a/src/mesa/drivers/dri/i965/brw_state.h b/src/mesa/drivers/dri/i965/brw_state.h index 324d7eb4ea2..a37ff2457f2 100644 --- a/src/mesa/drivers/dri/i965/brw_state.h +++ b/src/mesa/drivers/dri/i965/brw_state.h @@ -111,6 +111,8 @@ extern const struct brw_tracked_state gen6_vs_constants; extern const struct brw_tracked_state gen6_vs_state; extern const struct brw_tracked_state gen6_wm_constants; extern const struct brw_tracked_state gen6_wm_state; +extern const struct brw_tracked_state gen7_sbe_state; +extern const struct brw_tracked_state gen7_sf_state; extern const struct brw_tracked_state gen7_urb; /*********************************************************************** diff --git a/src/mesa/drivers/dri/i965/brw_state_upload.c b/src/mesa/drivers/dri/i965/brw_state_upload.c index 9476c2c359b..e2c690ee568 100644 --- a/src/mesa/drivers/dri/i965/brw_state_upload.c +++ b/src/mesa/drivers/dri/i965/brw_state_upload.c @@ -213,7 +213,8 @@ const struct brw_tracked_state *gen7_atoms[] = &gen6_vs_state, &gen6_gs_state, &gen6_clip_state, - &gen6_sf_state, + &gen7_sbe_state, + &gen7_sf_state, &gen6_wm_state, &gen6_scissor_state, diff --git a/src/mesa/drivers/dri/i965/gen7_sf_state.c b/src/mesa/drivers/dri/i965/gen7_sf_state.c new file mode 100644 index 00000000000..37c628d6ec8 --- /dev/null +++ b/src/mesa/drivers/dri/i965/gen7_sf_state.c @@ -0,0 +1,264 @@ +/* + * Copyright © 2011 Intel Corporation + * + * 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 without limitation + * the rights to use, copy, modify, merge, publish, 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. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE 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. + */ + +#include "brw_context.h" +#include "brw_state.h" +#include "brw_defines.h" +#include "brw_util.h" +#include "main/macros.h" +#include "intel_batchbuffer.h" + +static void +upload_sbe_state(struct brw_context *brw) +{ + struct intel_context *intel = &brw->intel; + struct gl_context *ctx = &intel->ctx; + /* CACHE_NEW_VS_PROG */ + uint32_t num_inputs = brw_count_bits(brw->vs.prog_data->outputs_written); + /* BRW_NEW_FRAGMENT_PROGRAM */ + uint32_t num_outputs = brw_count_bits(brw->fragment_program->Base.InputsRead); + uint32_t dw1, dw10, dw11; + int i; + int attr = 0; + /* _NEW_TRANSFORM */ + int urb_start = ctx->Transform.ClipPlanesEnabled ? 2 : 1; + /* _NEW_LIGHT */ + int two_side_color = (ctx->Light.Enabled && ctx->Light.Model.TwoSide); + + /* FINISHME: Attribute Swizzle Control Mode? */ + dw1 = + GEN7_SBE_SWIZZLE_ENABLE | + num_outputs << GEN7_SBE_NUM_OUTPUTS_SHIFT | + (num_inputs + 1) / 2 << GEN7_SBE_URB_ENTRY_READ_LENGTH_SHIFT | + urb_start << GEN7_SBE_URB_ENTRY_READ_OFFSET_SHIFT; + + /* _NEW_POINT */ + if (ctx->Point.SpriteOrigin == GL_LOWER_LEFT) + dw1 |= GEN6_SF_POINT_SPRITE_LOWERLEFT; + + dw10 = 0; + if (ctx->Point.PointSprite) { + for (i = 0; i < 8; i++) { + if (ctx->Point.CoordReplace[i]) + dw10 |= (1 << i); + } + } + + /* _NEW_LIGHT (flat shading) */ + dw11 = 0; + if (ctx->Light.ShadeModel == GL_FLAT) { + dw11 |= ((brw->fragment_program->Base.InputsRead & (FRAG_BIT_COL0 | FRAG_BIT_COL1)) >> + ((brw->fragment_program->Base.InputsRead & FRAG_BIT_WPOS) ? 0 : 1)); + } + + BEGIN_BATCH(14); + OUT_BATCH(_3DSTATE_SBE << 16 | (14 - 2)); + OUT_BATCH(dw1); + + /* Output dwords 2 through 9 */ + for (i = 0; i < 8; i++) { + uint32_t attr_overrides = 0; + + for (; attr < 64; attr++) { + if (brw->fragment_program->Base.InputsRead & BITFIELD64_BIT(attr)) { + attr_overrides |= get_attr_override(brw, attr, two_side_color); + attr++; + break; + } + } + + for (; attr < 64; attr++) { + if (brw->fragment_program->Base.InputsRead & BITFIELD64_BIT(attr)) { + attr_overrides |= get_attr_override(brw, attr, two_side_color) << 16; + attr++; + break; + } + } + OUT_BATCH(attr_overrides); + } + + OUT_BATCH(dw10); /* point sprite texcoord bitmask */ + OUT_BATCH(dw11); /* constant interp bitmask */ + OUT_BATCH(0); /* wrapshortest enables 0-7 */ + OUT_BATCH(0); /* wrapshortest enables 8-15 */ + ADVANCE_BATCH(); +} + +const struct brw_tracked_state gen7_sbe_state = { + .dirty = { + .mesa = (_NEW_LIGHT | + _NEW_POINT | + _NEW_TRANSFORM), + .brw = (BRW_NEW_CONTEXT | + BRW_NEW_FRAGMENT_PROGRAM), + .cache = CACHE_NEW_VS_PROG + }, + .emit = upload_sbe_state, +}; + +static void +upload_sf_state(struct brw_context *brw) +{ + struct intel_context *intel = &brw->intel; + struct gl_context *ctx = &intel->ctx; + uint32_t dw1, dw2, dw3; + float point_size; + /* _NEW_BUFFERS */ + bool render_to_fbo = brw->intel.ctx.DrawBuffer->Name != 0; + + /* FINISHME: Depth Buffer Surface Format? */ + dw1 = GEN6_SF_STATISTICS_ENABLE | GEN6_SF_VIEWPORT_TRANSFORM_ENABLE; + + /* _NEW_POLYGON */ + if ((ctx->Polygon.FrontFace == GL_CCW) ^ render_to_fbo) + dw1 |= GEN6_SF_WINDING_CCW; + + if (ctx->Polygon.OffsetFill) + dw1 |= GEN6_SF_GLOBAL_DEPTH_OFFSET_SOLID; + + if (ctx->Polygon.OffsetLine) + dw1 |= GEN6_SF_GLOBAL_DEPTH_OFFSET_WIREFRAME; + + if (ctx->Polygon.OffsetPoint) + dw1 |= GEN6_SF_GLOBAL_DEPTH_OFFSET_POINT; + + switch (ctx->Polygon.FrontMode) { + case GL_FILL: + dw1 |= GEN6_SF_FRONT_SOLID; + break; + + case GL_LINE: + dw1 |= GEN6_SF_FRONT_WIREFRAME; + break; + + case GL_POINT: + dw1 |= GEN6_SF_FRONT_POINT; + break; + + default: + assert(0); + break; + } + + switch (ctx->Polygon.BackMode) { + case GL_FILL: + dw1 |= GEN6_SF_BACK_SOLID; + break; + + case GL_LINE: + dw1 |= GEN6_SF_BACK_WIREFRAME; + break; + + case GL_POINT: + dw1 |= GEN6_SF_BACK_POINT; + break; + + default: + assert(0); + break; + } + + dw2 = 0; + + if (ctx->Polygon.CullFlag) { + switch (ctx->Polygon.CullFaceMode) { + case GL_FRONT: + dw2 |= GEN6_SF_CULL_FRONT; + break; + case GL_BACK: + dw2 |= GEN6_SF_CULL_BACK; + break; + case GL_FRONT_AND_BACK: + dw2 |= GEN6_SF_CULL_BOTH; + break; + default: + assert(0); + break; + } + } else { + dw2 |= GEN6_SF_CULL_NONE; + } + + /* _NEW_SCISSOR */ + if (ctx->Scissor.Enabled) + dw2 |= GEN6_SF_SCISSOR_ENABLE; + + /* _NEW_LINE */ + dw2 |= U_FIXED(CLAMP(ctx->Line.Width, 0.0, 7.99), 7) << + GEN6_SF_LINE_WIDTH_SHIFT; + if (ctx->Line.SmoothFlag) { + dw2 |= GEN6_SF_LINE_AA_ENABLE; + dw2 |= GEN6_SF_LINE_AA_MODE_TRUE; + dw2 |= GEN6_SF_LINE_END_CAP_WIDTH_1_0; + } + + /* FINISHME: Last Pixel Enable? Vertex Sub Pixel Precision Select? + * FINISHME: AA Line Distance Mode? + */ + + dw3 = 0; + + /* _NEW_POINT */ + if (!(ctx->VertexProgram.PointSizeEnabled || ctx->Point._Attenuated)) + dw3 |= GEN6_SF_USE_STATE_POINT_WIDTH; + + /* Clamp to ARB_point_parameters user limits */ + point_size = CLAMP(ctx->Point.Size, ctx->Point.MinSize, ctx->Point.MaxSize); + + /* Clamp to the hardware limits and convert to fixed point */ + dw3 |= U_FIXED(CLAMP(point_size, 0.125, 255.875), 3); + + /* _NEW_LIGHT */ + if (ctx->Light.ProvokingVertex != GL_FIRST_VERTEX_CONVENTION) { + dw3 |= + (2 << GEN6_SF_TRI_PROVOKE_SHIFT) | + (2 << GEN6_SF_TRIFAN_PROVOKE_SHIFT) | + (1 << GEN6_SF_LINE_PROVOKE_SHIFT); + } else { + dw3 |= (1 << GEN6_SF_TRIFAN_PROVOKE_SHIFT); + } + + BEGIN_BATCH(7); + OUT_BATCH(_3DSTATE_SF << 16 | (7 - 2)); + OUT_BATCH(dw1); + OUT_BATCH(dw2); + OUT_BATCH(dw3); + OUT_BATCH_F(ctx->Polygon.OffsetUnits * 2); /* constant. copied from gen4 */ + OUT_BATCH_F(ctx->Polygon.OffsetFactor); /* scale */ + OUT_BATCH_F(0.0); /* XXX: global depth offset clamp */ + ADVANCE_BATCH(); +} + +const struct brw_tracked_state gen7_sf_state = { + .dirty = { + .mesa = (_NEW_LIGHT | + _NEW_POLYGON | + _NEW_LINE | + _NEW_SCISSOR | + _NEW_BUFFERS | + _NEW_POINT), + .brw = BRW_NEW_CONTEXT, + .cache = CACHE_NEW_VS_PROG + }, + .emit = upload_sf_state, +}; |