fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 13:58:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

intel: Only prefer separate stencil when we can do HiZ.

Browse source 
This required is_hiz_depth_format to start returning true on S8_Z24 as
well, since that's the format we have here.  The two previous callers
are only calling it on non-depthstencil formats.

This avoids us needing to have HiZ working on a new Z format
immediately upon exposing the format (particularly painful for
Z32_FLOAT_X24S8, which means all the fake packed depth/stencil paths).

Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
This commit is contained in:
Eric Anholt 2011-11-30 08:52:54 -08:00
parent 576161289d
commit 5c9a55665d
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/mesa/drivers/dri/i965/brw_vtbl.c
View file

@ -214,8 +214,16 @@ static void brw_invalidate_state( struct intel_context *intel, GLuint new_state
static bool brw_is_hiz_depth_format(struct intel_context *intel,
gl_format format)
{
/* In the future, this will support Z_FLOAT32. */
return intel->has_hiz && (format == MESA_FORMAT_X8_Z24);
if (!intel->has_hiz)
return false;
switch (format) {
case MESA_FORMAT_X8_Z24:
case MESA_FORMAT_S8_Z24:
return true;
default:
return false;
}
}
void brwInitVtbl( struct brw_context *brw )

6
src/mesa/drivers/dri/intel/intel_mipmap_tree.c
View file

@ -119,8 +119,10 @@ intel_miptree_create_internal(struct intel_context *intel,
brw_miptree_layout(intel, mt);
#endif
if (intel->has_separate_stencil &&
_mesa_is_depthstencil_format(_mesa_get_format_base_format(format))) {
if (_mesa_is_depthstencil_format(_mesa_get_format_base_format(format)) &&
(intel->must_use_separate_stencil ||
(intel->has_separate_stencil &&
intel->vtbl.is_hiz_depth_format(intel, format)))) {
mt->stencil_mt = intel_miptree_create(intel,
mt->target,
MESA_FORMAT_S8,