From: Eric Anholt <eric@anholt.net>
Date: Wed, 12 Jul 2017 20:22:46 +0000 (-0700)
Subject: intel/decoder: Reuse the gen_make_gen() helper.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=decd2b32aa56f1d8b31cd9cef5a0891097083cd6;p=mesa.git

intel/decoder: Reuse the gen_make_gen() helper.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
---

diff --git a/src/intel/common/gen_decoder.c b/src/intel/common/gen_decoder.c
index 60591ad666b..85880143f00 100644
--- a/src/intel/common/gen_decoder.c
+++ b/src/intel/common/gen_decoder.c
@@ -39,8 +39,6 @@
 
 #define XML_BUFFER_SIZE 4096
 
-#define MAKE_GEN(major, minor) ( ((major) << 8) | (minor) )
-
 struct gen_spec {
    uint32_t gen;
 
@@ -420,7 +418,7 @@ start_element(void *data, const char *element_name, const char **atts)
       if (n == 1)
          minor = 0;
 
-      ctx->spec->gen = MAKE_GEN(major, minor);
+      ctx->spec->gen = gen_make_gen(major, minor);
    } else if (strcmp(element_name, "instruction") == 0 ||
               strcmp(element_name, "struct") == 0) {
       ctx->group = create_group(ctx, name, atts, NULL);