diff options
| author | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-07-20 08:24:15 -0700 |
|---|---|---|
| committer | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-07-26 07:58:44 -0700 |
| commit | 5d76690f170de9acc541aa6b4a507ccd20a78158 (patch) | |
| tree | 124b9a5ecfd95f843e7df6fad2d1249d1609990d /src/mesa/drivers/dri/i965/intel_mipmap_tree.c | |
| parent | 833e389bc00eae419efe4494c297c6c20a89210b (diff) | |
| download | external_mesa3d-5d76690f170de9acc541aa6b4a507ccd20a78158.zip external_mesa3d-5d76690f170de9acc541aa6b4a507ccd20a78158.tar.gz external_mesa3d-5d76690f170de9acc541aa6b4a507ccd20a78158.tar.bz2 | |
i965/miptree: Stop multiplying cube depth by 6 in HiZ calculations
intel_mipmap_tree::logical_depth0 is now in number of 2D slices so we no
longer need to be multiplying by 6.
Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
Cc: "12.0" <mesa-stable@lists.freedesktop.org>
Diffstat (limited to 'src/mesa/drivers/dri/i965/intel_mipmap_tree.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c index c8e84b7..a988221 100644 --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c @@ -1794,14 +1794,8 @@ intel_gen7_hiz_buf_create(struct brw_context *brw, hz_height = DIV_ROUND_UP(hz_height, 2); } else { const unsigned hz_qpitch = h0 + h1 + (12 * vertical_align); - if (mt->target == GL_TEXTURE_CUBE_MAP_ARRAY || - mt->target == GL_TEXTURE_CUBE_MAP) { - /* HZ_Height (rows) = Ceiling ( ( Q_pitch * Z_depth * 6/2) /8 ) * 8 */ - hz_height = DIV_ROUND_UP(hz_qpitch * Z0 * 6, 2 * 8) * 8; - } else { - /* HZ_Height (rows) = Ceiling ( ( Q_pitch * Z_depth/2) /8 ) * 8 */ - hz_height = DIV_ROUND_UP(hz_qpitch * Z0, 2 * 8) * 8; - } + /* HZ_Height (rows) = Ceiling ( ( Q_pitch * Z_depth/2) /8 ) * 8 */ + hz_height = DIV_ROUND_UP(hz_qpitch * Z0, 2 * 8) * 8; } unsigned long pitch; @@ -1898,15 +1892,6 @@ intel_gen8_hiz_buf_create(struct brw_context *brw, } else { /* HZ_Height (rows) = ceiling( (HZ_QPitch/2)/8) *8 * Z_Depth */ hz_height = DIV_ROUND_UP(buf->qpitch, 2 * 8) * 8 * Z0; - if (mt->target == GL_TEXTURE_CUBE_MAP_ARRAY || - mt->target == GL_TEXTURE_CUBE_MAP) { - /* HZ_Height (rows) = ceiling( (HZ_QPitch/2)/8) *8 * 6 * Z_Depth - * - * We can can just take our hz_height calculation from above, and - * multiply by 6 for the cube map and cube map array types. - */ - hz_height *= 6; - } } unsigned long pitch; |