diff options
author | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-05-11 17:11:52 -0700 |
---|---|---|
committer | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-05-14 14:18:21 -0700 |
commit | 64f29070302507e39f50aeeef0472b4d78d2b0cc (patch) | |
tree | ea9a2b677fca7c211b3b4c44eee4470f04cf3367 /src/mesa/drivers/dri/i965/intel_mipmap_tree.c | |
parent | f5febc83a7ea3b41435828e40ab8266ce96d7600 (diff) | |
download | external_mesa3d-64f29070302507e39f50aeeef0472b4d78d2b0cc.zip external_mesa3d-64f29070302507e39f50aeeef0472b4d78d2b0cc.tar.gz external_mesa3d-64f29070302507e39f50aeeef0472b4d78d2b0cc.tar.bz2 |
i965: Use blorp for all updownsample blits
We used to use a meta path because blorp didn't support 16x MSAA. Now it
does, so we don't need the meta paths anymore.
Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
Diffstat (limited to 'src/mesa/drivers/dri/i965/intel_mipmap_tree.c')
-rw-r--r-- | src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 34 |
1 files changed, 10 insertions, 24 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c index 45569fc..cc7ecf8 100644 --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c @@ -2273,32 +2273,18 @@ intel_miptree_updownsample(struct brw_context *brw, struct intel_mipmap_tree *src, struct intel_mipmap_tree *dst) { - /* There is support for only up to eight samples. */ - const bool use_blorp = src->num_samples <= 8 && dst->num_samples <= 8; - - if (use_blorp) { - brw_blorp_blit_miptrees(brw, - src, 0 /* level */, 0 /* layer */, - src->format, SWIZZLE_XYZW, - dst, 0 /* level */, 0 /* layer */, dst->format, - 0, 0, - src->logical_width0, src->logical_height0, - 0, 0, - dst->logical_width0, dst->logical_height0, - GL_NEAREST, false, false /*mirror x, y*/, - false, false); - } else if (src->format == MESA_FORMAT_S_UINT8) { - brw_meta_stencil_updownsample(brw, src, dst); - } else { - brw_meta_updownsample(brw, src, dst); - } + brw_blorp_blit_miptrees(brw, + src, 0 /* level */, 0 /* layer */, + src->format, SWIZZLE_XYZW, + dst, 0 /* level */, 0 /* layer */, dst->format, + 0, 0, + src->logical_width0, src->logical_height0, + 0, 0, + dst->logical_width0, dst->logical_height0, + GL_NEAREST, false, false /*mirror x, y*/, + false, false); if (src->stencil_mt) { - if (!use_blorp) { - brw_meta_stencil_updownsample(brw, src->stencil_mt, dst); - return; - } - brw_blorp_blit_miptrees(brw, src->stencil_mt, 0 /* level */, 0 /* layer */, src->stencil_mt->format, SWIZZLE_XYZW, |