diff options
author | Kenneth Graunke <[email protected]> | 2011-02-09 00:49:59 -0800 |
---|---|---|
committer | Kenneth Graunke <[email protected]> | 2011-05-17 23:32:59 -0700 |
commit | 18402fbf79e96d7afb6b690906a7656f01a92b9d (patch) | |
tree | 0d79484f7b159e7a7ca22eefc742c7ab0a483391 /src/mesa/drivers | |
parent | 81fd03fe56372c5c702bf257e821cea71ee25448 (diff) |
i965: Initial Ivybridge Viewport state setup.
SF and CLIP viewport state has been combined into SF_CLIP_VIEWPORT;
SF_CLIP and CC state pointers can now be uploaded independently.
Some portions of the hardware documentation refer to separate upload
commands for SF and CLIP; these are outdated and incorrect.
Signed-off-by: Kenneth Graunke <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r-- | src/mesa/drivers/dri/i965/Makefile | 1 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_defines.h | 3 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_state.h | 3 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_state_upload.c | 6 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_structs.h | 22 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/gen7_viewport_state.c | 106 |
6 files changed, 137 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i965/Makefile b/src/mesa/drivers/dri/i965/Makefile index c281320c274..a0a02eea9f4 100644 --- a/src/mesa/drivers/dri/i965/Makefile +++ b/src/mesa/drivers/dri/i965/Makefile @@ -101,6 +101,7 @@ DRIVER_SOURCES = \ gen7_clip_state.c \ gen7_sf_state.c \ gen7_urb.c \ + gen7_viewport_state.c \ gen7_wm_state.c C_SOURCES = \ diff --git a/src/mesa/drivers/dri/i965/brw_defines.h b/src/mesa/drivers/dri/i965/brw_defines.h index 04d5863b889..f784456e957 100644 --- a/src/mesa/drivers/dri/i965/brw_defines.h +++ b/src/mesa/drivers/dri/i965/brw_defines.h @@ -899,6 +899,9 @@ # define GEN6_SF_VIEWPORT_MODIFY (1 << 11) # define GEN6_CLIP_VIEWPORT_MODIFY (1 << 10) +#define _3DSTATE_VIEWPORT_STATE_POINTERS_CC 0x7823 /* GEN7+ */ +#define _3DSTATE_VIEWPORT_STATE_POINTERS_SF_CL 0x7821 /* GEN7+ */ + #define _3DSTATE_SCISSOR_STATE_POINTERS 0x780f /* GEN6+ */ #define _3DSTATE_VS 0x7810 /* GEN6+ */ diff --git a/src/mesa/drivers/dri/i965/brw_state.h b/src/mesa/drivers/dri/i965/brw_state.h index ec680e4205e..21a94e7a003 100644 --- a/src/mesa/drivers/dri/i965/brw_state.h +++ b/src/mesa/drivers/dri/i965/brw_state.h @@ -113,10 +113,13 @@ 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_blend_state_pointer; extern const struct brw_tracked_state gen7_cc_state_pointer; +extern const struct brw_tracked_state gen7_cc_viewport_state_pointer; extern const struct brw_tracked_state gen7_clip_state; extern const struct brw_tracked_state gen7_depth_stencil_state_pointer; extern const struct brw_tracked_state gen7_ps_state; extern const struct brw_tracked_state gen7_sbe_state; +extern const struct brw_tracked_state gen7_sf_clip_viewport; +extern const struct brw_tracked_state gen7_sf_clip_viewport_state_pointer; extern const struct brw_tracked_state gen7_sf_state; extern const struct brw_tracked_state gen7_urb; extern const struct brw_tracked_state gen7_wm_constants; diff --git a/src/mesa/drivers/dri/i965/brw_state_upload.c b/src/mesa/drivers/dri/i965/brw_state_upload.c index e3fd0911029..72978676444 100644 --- a/src/mesa/drivers/dri/i965/brw_state_upload.c +++ b/src/mesa/drivers/dri/i965/brw_state_upload.c @@ -179,9 +179,6 @@ const struct brw_tracked_state *gen7_atoms[] = &brw_gs_prog, &brw_wm_prog, - &gen6_clip_vp, - &gen6_sf_vp, - /* Command packets: */ &brw_invarient_state, @@ -189,7 +186,8 @@ const struct brw_tracked_state *gen7_atoms[] = &brw_state_base_address, &brw_cc_vp, - &gen6_viewport_state, /* must do after *_vp stages */ + &gen7_cc_viewport_state_pointer, /* must do after brw_cc_vp */ + &gen7_sf_clip_viewport, &gen7_urb, &gen6_blend_state, /* must do before cc unit */ diff --git a/src/mesa/drivers/dri/i965/brw_structs.h b/src/mesa/drivers/dri/i965/brw_structs.h index 6132bb91abe..561758f4eaa 100644 --- a/src/mesa/drivers/dri/i965/brw_structs.h +++ b/src/mesa/drivers/dri/i965/brw_structs.h @@ -1155,6 +1155,28 @@ struct gen6_sf_viewport { GLfloat m32; }; +struct gen7_sf_clip_viewport { + struct { + GLfloat m00; + GLfloat m11; + GLfloat m22; + GLfloat m30; + GLfloat m31; + GLfloat m32; + } viewport; + + GLuint pad0[2]; + + struct { + GLfloat xmin; + GLfloat xmax; + GLfloat ymin; + GLfloat ymax; + } guardband; + + GLfloat pad1[4]; +}; + /* Documented in the subsystem/shared-functions/sampler chapter... */ struct brw_surface_state diff --git a/src/mesa/drivers/dri/i965/gen7_viewport_state.c b/src/mesa/drivers/dri/i965/gen7_viewport_state.c new file mode 100644 index 00000000000..838ad3a3948 --- /dev/null +++ b/src/mesa/drivers/dri/i965/gen7_viewport_state.c @@ -0,0 +1,106 @@ +/* + * 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 "intel_batchbuffer.h" + +static void +prepare_sf_clip_viewport(struct brw_context *brw) +{ + struct gl_context *ctx = &brw->intel.ctx; + const GLfloat depth_scale = 1.0F / ctx->DrawBuffer->_DepthMaxF; + GLfloat y_scale, y_bias; + const GLboolean render_to_fbo = (ctx->DrawBuffer->Name != 0); + const GLfloat *v = ctx->Viewport._WindowMap.m; + struct gen7_sf_clip_viewport *vp; + + vp = brw_state_batch(brw, sizeof(vp), 64, &brw->sf.vp_offset); + /* Also assign to clip.vp_offset in case something uses it. */ + brw->clip.vp_offset = brw->sf.vp_offset; + + /* Disable guardband clipping (see gen6_viewport_state.c for rationale). */ + vp->guardband.xmin = -1.0; + vp->guardband.xmax = 1.0; + vp->guardband.ymin = -1.0; + vp->guardband.ymax = 1.0; + + /* _NEW_BUFFERS */ + if (render_to_fbo) { + y_scale = 1.0; + y_bias = 0; + } else { + y_scale = -1.0; + 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; +} + +static void upload_sf_clip_viewport_state_pointer(struct brw_context *brw) +{ + struct intel_context *intel = &brw->intel; + + BEGIN_BATCH(2); + OUT_BATCH(_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CL << 16 | (2 - 2)); + OUT_BATCH(brw->sf.vp_offset); + ADVANCE_BATCH(); +} + +const struct brw_tracked_state gen7_sf_clip_viewport = { + .dirty = { + .mesa = _NEW_VIEWPORT | _NEW_BUFFERS, + .brw = BRW_NEW_BATCH, + .cache = 0, + }, + .prepare = prepare_sf_clip_viewport, + .emit = upload_sf_clip_viewport_state_pointer, +}; + +/* ----------------------------------------------------- */ + +static void upload_cc_viewport_state_pointer(struct brw_context *brw) +{ + struct intel_context *intel = &brw->intel; + + BEGIN_BATCH(2); + OUT_BATCH(_3DSTATE_VIEWPORT_STATE_POINTERS_CC << 16 | (2 - 2)); + OUT_BATCH(brw->cc.vp_offset); + ADVANCE_BATCH(); +} + +const struct brw_tracked_state gen7_cc_viewport_state_pointer = { + .dirty = { + .mesa = 0, + .brw = BRW_NEW_BATCH, + .cache = CACHE_NEW_CC_VP + }, + .emit = upload_cc_viewport_state_pointer, +}; |