<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Fri, Jun 16, 2017 at 11:11 AM, Nanley Chery <span dir="ltr"><<a href="mailto:nanleychery@gmail.com" target="_blank">nanleychery@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class="">On Tue, Jun 13, 2017 at 05:50:09PM +0300, Topi Pohjolainen wrote:<br>
> Signed-off-by: Topi Pohjolainen <<a href="mailto:topi.pohjolainen@intel.com">topi.pohjolainen@intel.com</a>><br>
> ---<br>
> src/mesa/drivers/dri/i965/<wbr>intel_mipmap_tree.c | 76 +++++++++++++++++++++++++++<br>
> 1 file changed, 76 insertions(+)<br>
><br>
> diff --git a/src/mesa/drivers/dri/i965/<wbr>intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/<wbr>intel_mipmap_tree.c<br>
> index 212dfa30ec..0854b4eb5d 100644<br>
> --- a/src/mesa/drivers/dri/i965/<wbr>intel_mipmap_tree.c<br>
> +++ b/src/mesa/drivers/dri/i965/<wbr>intel_mipmap_tree.c<br>
> @@ -643,6 +643,82 @@ free_aux_state_map(enum isl_aux_state **state)<br>
> }<br>
><br>
> static struct intel_mipmap_tree *<br>
> +make_surface(struct brw_context *brw, GLenum target, mesa_format format,<br>
> + unsigned first_level, unsigned last_level,<br>
> + unsigned width0, unsigned height0, unsigned depth0,<br>
> + unsigned num_samples, enum isl_tiling isl_tiling,<br>
> + isl_surf_usage_flags_t isl_usage_flags, uint32_t alloc_flags,<br>
> + struct brw_bo *bo)<br>
</span> ^<br>
const ?<br><div><div class="h5"></div></div></blockquote><div><br></div><div>No. For one thing, I'm fairly sure that, at least in the future, we'll need to be able to modify the bo->is_scanout flag. More importantly, however, this is creating a mutable miptree which means that what it returns provides a way of changing the contents of the BO so making the BO const is a lie.<br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div><div class="h5">
> +{<br>
> + struct intel_mipmap_tree *mt = calloc(sizeof(*mt), 1);<br>
> + if (!mt)<br>
> + return NULL;<br>
> +<br>
> + if (!create_mapping_table(target, first_level, last_level, depth0,<br>
> + mt->level)) {<br>
> + free(mt);<br>
> + return NULL;<br>
> + }<br>
> +<br>
> + if (target == GL_TEXTURE_CUBE_MAP ||<br>
> + target == GL_TEXTURE_CUBE_MAP_ARRAY)<br>
> + isl_usage_flags |= ISL_SURF_USAGE_CUBE_BIT;<br>
> +<br>
> + DBG("%s: %s %s %ux %u:%u:%u %d..%d <-- %p\n",<br>
> + __func__,<br>
> + _mesa_enum_to_string(target),<br>
> + _mesa_get_format_name(format),<br>
> + num_samples, width0, height0, depth0,<br>
> + first_level, last_level, mt);<br>
> +<br>
> + struct isl_surf_init_info init_info = {<br>
> + .dim = get_isl_surf_dim(target),<br>
> + .format = translate_tex_format(brw, format, false),<br>
> + .width = width0,<br>
> + .height = height0,<br>
> + .depth = target == GL_TEXTURE_3D ? depth0 : 1,<br>
> + .levels = last_level - first_level + 1,<br>
> + .array_len = target == GL_TEXTURE_3D ? 1 : depth0,<br>
> + .samples = MAX2(num_samples, 1),<br>
> + .usage = isl_usage_flags,<br>
> + .tiling_flags = 1u << isl_tiling<br>
> + };<br>
> +<br>
> + if (!isl_surf_init_s(&brw->isl_<wbr>dev, &mt->surf, &init_info))<br>
> + goto fail;<br>
> +<br>
> + assert(mt->surf.size % mt->surf.row_pitch == 0);<br>
> +<br>
> + if (!bo) {<br>
> + unsigned pitch = mt->surf.row_pitch;<br>
</div></div> ^<br>
MAYBE_UNUSED for release builds?<br></blockquote><div><br></div><div>I think it's probably ok since it's passed in to brw_bo_alloc_tiled. Then again, I'm pretty sure topi has rebased on top of the new brw_bo_alloc_tiled which gets rid of all this nonsense.<br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
This patch is<br>
Reviewed-by: Nanley Chery <<a href="mailto:nanley.g.chery@intel.com">nanley.g.chery@intel.com</a>><br>
<br>
I've taken a brief skim at the rest of the patches and it all looks<br>
good. Given that the rest of the series has already been reviewed, I<br>
think I'll stop here.<br>
<br>
Cheers,<br>
Nanley<br>
<div class="HOEnZb"><div class="h5"><br>
> + mt->bo = brw_bo_alloc_tiled(brw-><wbr>bufmgr, "isl-miptree",<br>
> + mt->surf.row_pitch,<br>
> + mt->surf.size / mt->surf.row_pitch,<br>
> + 1, isl_tiling_to_bufmgr_tiling(<wbr>isl_tiling),<br>
> + &pitch, alloc_flags);<br>
> + if (!mt->bo)<br>
> + goto fail;<br>
> +<br>
> + assert(pitch == mt->surf.row_pitch);<br>
> + } else {<br>
> + mt->bo = bo;<br>
> + }<br>
> +<br>
> + mt->first_level = first_level;<br>
> + mt->last_level = last_level;<br>
> + mt->target = target;<br>
> + mt->format = format;<br>
> + mt->refcount = 1;<br>
> + mt->aux_state = NULL;<br>
> +<br>
> + return mt;<br>
> +<br>
> +fail:<br>
> + intel_miptree_release(&mt);<br>
> + return NULL;<br>
> +}<br>
> +<br>
> +static struct intel_mipmap_tree *<br>
> miptree_create(struct brw_context *brw,<br>
> GLenum target,<br>
> mesa_format format,<br>
> --<br>
> 2.11.0<br>
><br>
> ______________________________<wbr>_________________<br>
> mesa-dev mailing list<br>
> <a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a><br>
> <a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/<wbr>mailman/listinfo/mesa-dev</a><br>
______________________________<wbr>_________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a><br>
<a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/<wbr>mailman/listinfo/mesa-dev</a><br>
</div></div></blockquote></div><br></div></div>