OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i965/gen8: Surface state overriding for stencil

Browse Source 
v2: Allow hardware to offset accesses to individual layers. Also leave
    the mip-level overriding for the creator of the intel renderbuffer
    to handle. Merged with "i965/gen8: Allow stencil buffers to be
    configured as single sampled"

Ken: I left the "_mesa_problem()" still in place. I think it is clearer
     to remove it in a separate patch.

Cc: "10.2" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Topi Pohjolainen
2014-05-07 12:16:28 +03:00
parent 6aefaa4eb2
commit 36caae48b2
1 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/mesa/drivers/dri/i965/gen8_surface_state.c
View File

@@ -292,8 +292,8 @@ gen8_update_renderbuffer_surface(struct brw_context *brw,
uint32_t surf_type; uint32_t surf_type;
bool is_array = false; bool is_array = false;
int depth = MAX2(irb->layer_count, 1); int depth = MAX2(irb->layer_count, 1);
int min_array_element = irb->mt_layer / MAX2(mt->num_samples, 1); const int min_array_element = (mt->format == MESA_FORMAT_S_UINT8) ?
irb->mt_layer : (irb->mt_layer / MAX2(mt->num_samples, 1));
GLenum gl_target = GLenum gl_target =
rb->TexImage ? rb->TexImage->TexObject->Target : GL_TEXTURE_2D; rb->TexImage ? rb->TexImage->TexObject->Target : GL_TEXTURE_2D;
@@ -302,9 +302,6 @@ gen8_update_renderbuffer_surface(struct brw_context *brw,
intel_miptree_used_for_rendering(mt); intel_miptree_used_for_rendering(mt);
/* Render targets can't use IMS layout. */
assert(mt->msaa_layout != INTEL_MSAA_LAYOUT_IMS);
switch (gl_target) { switch (gl_target) {
case GL_TEXTURE_CUBE_MAP_ARRAY: case GL_TEXTURE_CUBE_MAP_ARRAY:
case GL_TEXTURE_CUBE_MAP: case GL_TEXTURE_CUBE_MAP:
@@ -322,12 +319,21 @@ gen8_update_renderbuffer_surface(struct brw_context *brw,
} }
/* _NEW_BUFFERS */ /* _NEW_BUFFERS */
mesa_format rb_format = _mesa_get_render_format(ctx, intel_rb_format(irb)); /* Render targets can't use IMS layout. Stencil in turn gets configured as
assert(brw_render_target_supported(brw, rb)); * single sampled and indexed manually by the program.
format = brw->render_target_format[rb_format]; */
if (unlikely(!brw->format_supported_as_render_target[rb_format])) { if (mt->format == MESA_FORMAT_S_UINT8) {
_mesa_problem(ctx, "%s: renderbuffer format %s unsupported\n", brw_configure_w_tiled(mt, true, &width, &height, &pitch,
__FUNCTION__, _mesa_get_format_name(rb_format)); &tiling, &format);
} else {
assert(mt->msaa_layout != INTEL_MSAA_LAYOUT_IMS);
assert(brw_render_target_supported(brw, rb));
mesa_format rb_format = _mesa_get_render_format(ctx,
intel_rb_format(irb));
format = brw->render_target_format[rb_format];
if (unlikely(!brw->format_supported_as_render_target[rb_format]))
_mesa_problem(ctx, "%s: renderbuffer format %s unsupported\n",
__FUNCTION__, _mesa_get_format_name(rb_format));
} }
uint32_t *surf = brw_state_batch(brw, AUB_TRACE_SURFACE_STATE, 13 * 4, 64, uint32_t *surf = brw_state_batch(brw, AUB_TRACE_SURFACE_STATE, 13 * 4, 64,
@@ -348,10 +354,12 @@ gen8_update_renderbuffer_surface(struct brw_context *brw,
surf[3] = (depth - 1) << BRW_SURFACE_DEPTH_SHIFT | surf[3] = (depth - 1) << BRW_SURFACE_DEPTH_SHIFT |
(pitch - 1); /* Surface Pitch */ (pitch - 1); /* Surface Pitch */
surf[4] = gen7_surface_msaa_bits(mt->num_samples, mt->msaa_layout) | surf[4] = min_array_element << GEN7_SURFACE_MIN_ARRAY_ELEMENT_SHIFT |
min_array_element << GEN7_SURFACE_MIN_ARRAY_ELEMENT_SHIFT |
(depth - 1) << GEN7_SURFACE_RENDER_TARGET_VIEW_EXTENT_SHIFT; (depth - 1) << GEN7_SURFACE_RENDER_TARGET_VIEW_EXTENT_SHIFT;
if (mt->format != MESA_FORMAT_S_UINT8)
surf[4] |= gen7_surface_msaa_bits(mt->num_samples, mt->msaa_layout);
surf[5] = irb->mt_level - irb->mt->first_level; surf[5] = irb->mt_level - irb->mt->first_level;
surf[6] = 0; /* Nothing of relevance. */ surf[6] = 0; /* Nothing of relevance. */