<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Tue, Nov 29, 2016 at 12:48 PM, Kristian H. Kristensen <span dir="ltr"><<a href="mailto:hoegsberg@gmail.com" target="_blank">hoegsberg@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Cleaner this way and we avoid including gen9_pack.h when we compile with<br>
gen8_pack.h. We also avoid the if (cherryview) condition for non-gen8<br>
gens that don't need it.<br>
<br>
Signed-off-by: Kristian H. Kristensen <<a href="mailto:hoegsberg@gmail.com">hoegsberg@gmail.com</a>><br>
---<br>
src/intel/vulkan/gen8_cmd_<wbr>buffer.c | 13 ++++++++++++-<br>
1 file changed, 12 insertions(+), 1 deletion(-)<br>
<br>
diff --git a/src/intel/vulkan/gen8_cmd_<wbr>buffer.c b/src/intel/vulkan/gen8_cmd_<wbr>buffer.c<br>
index 6578c22..20cde9f 100644<br>
--- a/src/intel/vulkan/gen8_cmd_<wbr>buffer.c<br>
+++ b/src/intel/vulkan/gen8_cmd_<wbr>buffer.c<br>
@@ -120,7 +120,8 @@ __emit_genx_sf_state(struct anv_cmd_buffer *cmd_buffer)<br>
cmd_buffer->state.pipeline-><wbr>gen8.sf);<br>
}<br>
<br>
-#include "genxml/gen9_pack.h"<br>
+#if GEN_GEN == 9<br>
+<br>
static void<br></blockquote><div><br></div><div>Doesn't this need to become non-static if it's being called from gen8? Also, do we need a declaration in that case?<br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
__emit_gen9_sf_state(struct anv_cmd_buffer *cmd_buffer)<br>
{<br>
@@ -144,6 +145,16 @@ __emit_sf_state(struct anv_cmd_buffer *cmd_buffer)<br>
__emit_genx_sf_state(cmd_<wbr>buffer);<br>
}<br>
<br>
+#else<br>
+<br>
+static void<br>
+__emit_sf_state(struct anv_cmd_buffer *cmd_buffer)<br></blockquote><div><br></div><div>Isn't cherryview gen8? This is what we get on gen8? Did you test this?<br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+{<br>
+ __emit_genx_sf_state(cmd_<wbr>buffer);<br>
+}<br>
+<br>
+#endif<br>
+<br>
void<br>
genX(cmd_buffer_flush_dynamic_<wbr>state)(struct anv_cmd_buffer *cmd_buffer)<br>
{<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.9.3<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>
</font></span></blockquote></div><br></div></div>