From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Mon, 27 Nov 2017 16:29:34 +0000 (-0800)
Subject: anv/cmd_buffer: Add an anv_genX_call macro
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c180c2c868f2fccde224a959b5dcba4486cc4c60;p=mesa.git

anv/cmd_buffer: Add an anv_genX_call macro

This is copied and pasted from the similar macro we added to ISL.

Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
Reviewed-by: Nanley Chery <nanley.g.chery@intel.com>
---

diff --git a/src/intel/vulkan/anv_cmd_buffer.c b/src/intel/vulkan/anv_cmd_buffer.c
index d703d7a8335..59fc5c9fc01 100644
--- a/src/intel/vulkan/anv_cmd_buffer.c
+++ b/src/intel/vulkan/anv_cmd_buffer.c
@@ -314,24 +314,34 @@ VkResult anv_ResetCommandBuffer(
    return anv_cmd_buffer_reset(cmd_buffer);
 }
 
+#define anv_genX_call(devinfo, func, ...)          \
+   switch ((devinfo)->gen) {                       \
+   case 7:                                         \
+      if ((devinfo)->is_haswell) {                 \
+         gen75_##func(__VA_ARGS__);                \
+      } else {                                     \
+         gen7_##func(__VA_ARGS__);                 \
+      }                                            \
+      break;                                       \
+   case 8:                                         \
+      gen8_##func(__VA_ARGS__);                    \
+      break;                                       \
+   case 9:                                         \
+      gen9_##func(__VA_ARGS__);                    \
+      break;                                       \
+   case 10:                                        \
+      gen10_##func(__VA_ARGS__);                   \
+      break;                                       \
+   default:                                        \
+      assert(!"Unknown hardware generation");      \
+   }
+
 void
 anv_cmd_buffer_emit_state_base_address(struct anv_cmd_buffer *cmd_buffer)
 {
-   switch (cmd_buffer->device->info.gen) {
-   case 7:
-      if (cmd_buffer->device->info.is_haswell)
-         return gen75_cmd_buffer_emit_state_base_address(cmd_buffer);
-      else
-         return gen7_cmd_buffer_emit_state_base_address(cmd_buffer);
-   case 8:
-      return gen8_cmd_buffer_emit_state_base_address(cmd_buffer);
-   case 9:
-      return gen9_cmd_buffer_emit_state_base_address(cmd_buffer);
-   case 10:
-      return gen10_cmd_buffer_emit_state_base_address(cmd_buffer);
-   default:
-      unreachable("unsupported gen\n");
-   }
+   anv_genX_call(&cmd_buffer->device->info,
+                 cmd_buffer_emit_state_base_address,
+                 cmd_buffer);
 }
 
 void anv_CmdBindPipeline(