diff options
| author | Paul Berry <stereotype441@gmail.com> | 2012-05-09 16:00:43 -0700 |
|---|---|---|
| committer | Paul Berry <stereotype441@gmail.com> | 2012-05-25 08:45:11 -0700 |
| commit | b08545199ac8a01392a805f158d22cc03060a6fb (patch) | |
| tree | eaa2d5aa5321ef9587fe5f9821a9ee58d0af2a42 | |
| parent | 1c73c705fadf164d61003415e3380f2d06f2e7b3 (diff) | |
i965/blorp: Enable blorp blits on Gen7.
Gen7 support for blorp (blits using the render bath) now works for
non-MSAA purposes. This patch enables it.
Since blorp operations re-use the logic for HiZ ops, this required
adding a case to the switch statement in gen7_blorp_emit_wm_config(),
to allow for the case where no HiZ op is being performed.
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_blorp_blit.cpp | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen7_blorp.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp b/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp index 47452b8d64..10d94a681d 100644 --- a/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp +++ b/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp @@ -187,8 +187,8 @@ brw_blorp_framebuffer(struct intel_context *intel, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter) { - /* BLORP is only supported on Gen6. TODO: implement on Gen7. */ - if (intel->gen != 6) + /* BLORP is not supported before Gen6. */ + if (intel->gen < 6) return mask; static GLbitfield buffer_bits[] = { diff --git a/src/mesa/drivers/dri/i965/gen7_blorp.cpp b/src/mesa/drivers/dri/i965/gen7_blorp.cpp index 04548bf63b..9e1aa4b8d9 100644 --- a/src/mesa/drivers/dri/i965/gen7_blorp.cpp +++ b/src/mesa/drivers/dri/i965/gen7_blorp.cpp @@ -416,6 +416,8 @@ gen7_blorp_emit_wm_config(struct brw_context *brw, case GEN6_HIZ_OP_HIZ_RESOLVE: dw1 |= GEN7_WM_HIERARCHICAL_DEPTH_RESOLVE; break; + case GEN6_HIZ_OP_NONE: + break; default: assert(0); break; |