diff options
author | Jordan Justen <jordan.l.justen@intel.com> | 2013-07-09 15:16:35 -0700 |
---|---|---|
committer | Jordan Justen <jordan.l.justen@intel.com> | 2014-07-30 11:49:28 -0700 |
commit | c856cbc8045c506d3e5dde96d580057f5a03ad00 (patch) | |
tree | e5549c0b715bd702d9c20c81576b1b691e9d5c91 | |
parent | b1646cc5c01bb24de249d2467e6051a18c5ff45d (diff) |
i965/gen6 depth surface: calculate depth (array size) for depth surface
(bc1acaa for gen6)
This will be used in 3DSTATE_DEPTH_BUFFER in a later patch.
Note: Cube maps are treated as 2D arrays with 6 times as
many array elements as the cube map array would have.
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
-rw-r--r-- | src/mesa/drivers/dri/i965/gen6_blorp.cpp | 2 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/gen6_depth_state.c | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i965/gen6_blorp.cpp b/src/mesa/drivers/dri/i965/gen6_blorp.cpp index 3fc36aa3ef..20ba31e58a 100644 --- a/src/mesa/drivers/dri/i965/gen6_blorp.cpp +++ b/src/mesa/drivers/dri/i965/gen6_blorp.cpp @@ -792,6 +792,7 @@ gen6_blorp_emit_depth_stencil_config(struct brw_context *brw, uint32_t draw_y = params->depth.y_offset; uint32_t tile_mask_x, tile_mask_y; uint32_t surftype; + unsigned int depth = MAX2(params->depth.mt->logical_depth0, 1); GLenum gl_target = params->depth.mt->target; switch (gl_target) { @@ -803,6 +804,7 @@ gen6_blorp_emit_depth_stencil_config(struct brw_context *brw, * equivalent. */ surftype = BRW_SURFACE_2D; + depth *= 6; break; default: surftype = translate_tex_target(gl_target); diff --git a/src/mesa/drivers/dri/i965/gen6_depth_state.c b/src/mesa/drivers/dri/i965/gen6_depth_state.c index 0480142505..8bc0073eda 100644 --- a/src/mesa/drivers/dri/i965/gen6_depth_state.c +++ b/src/mesa/drivers/dri/i965/gen6_depth_state.c @@ -47,6 +47,7 @@ gen6_emit_depth_stencil_hiz(struct brw_context *brw, struct gl_context *ctx = &brw->ctx; struct gl_framebuffer *fb = ctx->DrawBuffer; uint32_t surftype; + unsigned int depth = 1; GLenum gl_target = GL_TEXTURE_2D; const struct intel_renderbuffer *irb = NULL; const struct gl_renderbuffer *rb = NULL; @@ -77,6 +78,7 @@ gen6_emit_depth_stencil_hiz(struct brw_context *brw, rb = (struct gl_renderbuffer*) irb; if (rb) { + depth = MAX2(rb->Depth, 1); if (rb->TexImage) gl_target = rb->TexImage->TexObject->Target; } @@ -90,6 +92,7 @@ gen6_emit_depth_stencil_hiz(struct brw_context *brw, * equivalent. */ surftype = BRW_SURFACE_2D; + depth *= 6; break; default: surftype = translate_tex_target(gl_target); |