Module: Mesa Branch: master Commit: d45fadf11a8dbd9cdf0a1548a38127462b4ceee0 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d45fadf11a8dbd9cdf0a1548a38127462b4ceee0
Author: Topi Pohjolainen <[email protected]> Date: Mon May 12 12:42:28 2014 +0300 i965/fb: Use meta path for stencil up/downsampling Cc: "10.2" <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]> Signed-off-by: Topi Pohjolainen <[email protected]> --- src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c index 2ce3399..7e626db 100644 --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c @@ -1652,7 +1652,7 @@ intel_miptree_updownsample(struct brw_context *brw, struct intel_mipmap_tree *src, struct intel_mipmap_tree *dst) { - if (brw->gen < 8 || src->format == MESA_FORMAT_S_UINT8) { + if (brw->gen < 8) { brw_blorp_blit_miptrees(brw, src, 0 /* level */, 0 /* layer */, dst, 0 /* level */, 0 /* layer */, @@ -1661,11 +1661,18 @@ intel_miptree_updownsample(struct brw_context *brw, 0, 0, dst->logical_width0, dst->logical_height0, GL_NEAREST, false, false /*mirror x, y*/); + } else if (src->format == MESA_FORMAT_S_UINT8) { + brw_meta_stencil_updownsample(brw, src, dst); } else { brw_meta_updownsample(brw, src, dst); } if (src->stencil_mt) { + if (brw->gen >= 8) { + brw_meta_stencil_updownsample(brw, src->stencil_mt, dst); + return; + } + brw_blorp_blit_miptrees(brw, src->stencil_mt, 0 /* level */, 0 /* layer */, dst->stencil_mt, 0 /* level */, 0 /* layer */, _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
