<div dir="ltr"><br><div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, May 26, 2016 at 3:20 PM, Vinson Lee <span dir="ltr"><<a href="mailto:vlee@freedesktop.org" target="_blank">vlee@freedesktop.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> CC nir/nir_lower_tex.lo<br>
nir/nir_lower_tex.c: In function ‘convert_yuv_to_rgb’:<br>
nir/nir_lower_tex.c:202: error: unknown field ‘f32’ specified in initializer<br>
nir/nir_lower_tex.c:202: warning: missing braces around initializer<br>
nir/nir_lower_tex.c:202: warning: (near initialization for ‘m[0].<anonymous>.f32’)<br>
nir/nir_lower_tex.c:203: error: unknown field ‘f32’ specified in initializer<br>
nir/nir_lower_tex.c:204: error: unknown field ‘f32’ specified in initializer<br>
<br>
Fixes: a41b57679fd6 ("nir: Add a lowering pass for YUV textures")<br>
Bugzilla: <a href="https://bugs.freedesktop.org/show_bug.cgi?id=96221" rel="noreferrer" target="_blank">https://bugs.freedesktop.org/show_bug.cgi?id=96221</a><br>
Signed-off-by: Vinson Lee <<a href="mailto:vlee@freedesktop.org">vlee@freedesktop.org</a>><br></blockquote><div><br></div><div>This patch is correct. However, I think a better solution is to make nir_const_value a union rather than a struct of anonymous union. I'll send a patch to do that. It'd be nice if you could compile-test it for me.<br></div><div>--Jason<br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
---<br>
src/compiler/nir/nir_lower_tex.c | 6 +++---<br>
1 files changed, 3 insertions(+), 3 deletions(-)<br>
<br>
diff --git a/src/compiler/nir/nir_lower_tex.c b/src/compiler/nir/nir_lower_tex.c<br>
index 195cb1d..594abf7 100644<br>
--- a/src/compiler/nir/nir_lower_tex.c<br>
+++ b/src/compiler/nir/nir_lower_tex.c<br>
@@ -199,9 +199,9 @@ convert_yuv_to_rgb(nir_builder *b, nir_tex_instr *tex,<br>
nir_ssa_def *y, nir_ssa_def *u, nir_ssa_def *v)<br>
{<br>
nir_const_value m[3] = {<br>
- { .f32 = { 1.0f, 0.0f, 1.59602678f, 0.0f } },<br>
- { .f32 = { 1.0f, -0.39176229f, -0.81296764f, 0.0f } },<br>
- { .f32 = { 1.0f, 2.01723214f, 0.0f, 0.0f } }<br>
+ { { .f32 = { 1.0f, 0.0f, 1.59602678f, 0.0f } } },<br>
+ { { .f32 = { 1.0f, -0.39176229f, -0.81296764f, 0.0f } } },<br>
+ { { .f32 = { 1.0f, 2.01723214f, 0.0f, 0.0f } } }<br>
};<br>
<br>
nir_ssa_def *yuv =<br>
<span class="HOEnZb"><font color="#888888">--<br>
1.7.1<br>
<br>
</font></span></blockquote></div><br></div></div></div>