<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta name="Generator" content="Microsoft Word 15 (filtered medium)"> <style></style> </head> <body lang="FI" link="blue" vlink="purple"> <div class="WordSection1"> Originally, I had the entire astc and aux checking in a dedicated function; would that be more preferable? <o:p></o:p> <o:p> </o:p> -Kevin<o:p></o:p> <a name="_MailEndCompose"><o:p> </o:p></a> <a name="_____replyseparator"></a>From: Jason Ekstrand [mailto:jason@jlekstrand.net] Sent: Tuesday, March 6, 2018 6:02 PM To: Rogovin, Kevin <kevin.rogovin@intel.com> Cc: ML mesa-dev <mesa-dev@lists.freedesktop.org> Subject: Re: [Mesa-dev] [PATCH v3 3/7] i965: set ASTC5x5 workaround texture type tracking on texture validate<o:p></o:p> <o:p> </o:p> <div> I don't really like this being in texture validation. It has nothing to do with texture validation. Instead, we should put it in brw_predraw_resolve_inputs and do it as a pre-pass. This would let us store astc5x5_present as a local variable. Also, I don't think we need texture_with_auxiliary_present for anything since our solution is to resolve those.<o:p></o:p> </div> <div> <o:p> </o:p> <div> On Tue, Feb 27, 2018 at 1:30 AM, <<a href="mailto:kevin.rogovin@intel.com" target="_blank">kevin.rogovin@intel.com</a>> wrote:<o:p></o:p> <blockquote style="border:none;border-left:solid #CCCCCC 1.0pt;padding:0in 0in 0in 6.0pt;margin-left:4.8pt;margin-right:0in"> From: Kevin Rogovin <<a href="mailto:kevin.rogovin@intel.com">kevin.rogovin@intel.com</a>> Signed-off-by: Kevin Rogovin <<a href="mailto:kevin.rogovin@intel.com">kevin.rogovin@intel.com</a>> --- src/mesa/drivers/dri/i965/intel_tex_validate.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/mesa/drivers/dri/i965/intel_tex_validate.c b/src/mesa/drivers/dri/i965/intel_tex_validate.c index eaa60ba..2bf6c65 100644 --- a/src/mesa/drivers/dri/i965/intel_tex_validate.c +++ b/src/mesa/drivers/dri/i965/intel_tex_validate.c @@ -179,6 +179,8 @@ brw_validate_textures(struct brw_context *brw) struct gl_context *ctx = &brw->ctx; const int max_enabled_unit = ctx->Texture._MaxEnabledTexImageUnit; + brw->astc5x5_wa.texture_astc5x5_present = false; + brw->astc5x5_wa.texture_with_auxilary_present = false; for (int unit = 0; unit <= max_enabled_unit; unit++) { struct gl_texture_object *tex_obj = ctx->Texture.Unit[unit]._Current; @@ -194,5 +196,18 @@ brw_validate_textures(struct brw_context *brw) intel_update_max_level(tex_obj, sampler); intel_finalize_mipmap_tree(brw, tex_obj); + + /* ASTC5x5 workaround needs to know if textures in use have + * auxilary in buffers and/or a texture in use is ASTC5x5 + */ + struct intel_texture_object *tex = intel_texture_object(tex_obj); + struct intel_mipmap_tree *mt = tex->mt; + if (mt && mt->aux_usage != ISL_AUX_USAGE_NONE) { + brw->astc5x5_wa.texture_with_auxilary_present = true; + } + if (tex->_Format == MESA_FORMAT_RGBA_ASTC_5x5 || + tex->_Format == MESA_FORMAT_SRGB8_ALPHA8_ASTC_5x5) { + brw->astc5x5_wa.texture_astc5x5_present = true; + } } } -- 2.7.4 _______________________________________________ mesa-dev mailing list <a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a> <a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a><o:p></o:p> </blockquote> </div> <o:p> </o:p> </div> </div> </body> </html>