fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-26 19:20:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

gen7 depth surface: calculate depth (array size) for depth surface

Browse source 
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: Paul Berry <stereotype441@gmail.com>
This commit is contained in:
Jordan Justen 2013-07-09 15:16:35 -07:00
parent 171e633294
commit bc1acaa426
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/drivers/dri/i965/gen7_blorp.cpp
View file

@ -664,6 +664,7 @@ gen7_blorp_emit_depth_stencil_config(struct brw_context *brw,
uint32_t tile_mask_x, tile_mask_y; uint32_t tile_mask_x, tile_mask_y;
uint8_t mocs = brw->is_haswell ? GEN7_MOCS_L3 : 0; uint8_t mocs = brw->is_haswell ? GEN7_MOCS_L3 : 0;
uint32_t surftype; uint32_t surftype;
unsigned int depth = MAX2(params->depth.mt->logical_depth0, 1);
GLenum gl_target = params->depth.mt->target; GLenum gl_target = params->depth.mt->target;
brw_get_depthstencil_tile_masks(params->depth.mt, brw_get_depthstencil_tile_masks(params->depth.mt,
@ -680,6 +681,7 @@ gen7_blorp_emit_depth_stencil_config(struct brw_context *brw,
* equivalent. * equivalent.
*/ */
surftype = BRW_SURFACE_2D; surftype = BRW_SURFACE_2D;
depth *= 6;
break; break;
default: default:
surftype = translate_tex_target(gl_target); surftype = translate_tex_target(gl_target);

3
src/mesa/drivers/dri/i965/gen7_misc_state.c
View file

@ -44,6 +44,7 @@ gen7_emit_depth_stencil_hiz(struct brw_context *brw,
uint8_t mocs = brw->is_haswell ? GEN7_MOCS_L3 : 0; uint8_t mocs = brw->is_haswell ? GEN7_MOCS_L3 : 0;
struct gl_framebuffer *fb = ctx->DrawBuffer; struct gl_framebuffer *fb = ctx->DrawBuffer;
uint32_t surftype; uint32_t surftype;
unsigned int depth = 1;
GLenum gl_target = GL_TEXTURE_2D; GLenum gl_target = GL_TEXTURE_2D;
const struct intel_renderbuffer *irb = NULL; const struct intel_renderbuffer *irb = NULL;
const struct gl_renderbuffer *rb = NULL; const struct gl_renderbuffer *rb = NULL;
@ -56,6 +57,7 @@ gen7_emit_depth_stencil_hiz(struct brw_context *brw,
rb = (struct gl_renderbuffer*) irb; rb = (struct gl_renderbuffer*) irb;
if (rb) { if (rb) {
depth = MAX2(rb->Depth, 1);
if (rb->TexImage) if (rb->TexImage)
gl_target = rb->TexImage->TexObject->Target; gl_target = rb->TexImage->TexObject->Target;
} }
@ -69,6 +71,7 @@ gen7_emit_depth_stencil_hiz(struct brw_context *brw,
* equivalent. * equivalent.
*/ */
surftype = BRW_SURFACE_2D; surftype = BRW_SURFACE_2D;
depth *= 6;
break; break;
default: default:
surftype = translate_tex_target(gl_target); surftype = translate_tex_target(gl_target);