From 755e7e6c20b8778bd5becb516c437f44c7b37984 Mon Sep 17 00:00:00 2001 From: Jordan Justen Date: Mon, 26 Feb 2018 20:31:22 -0800 Subject: [PATCH] intel/common: Use isl for decoder surface formats MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jordan Justen Reviewed-by: Samuel Iglesias Gonsálvez --- src/intel/common/gen_decoder.c | 8 ++++++++ src/intel/common/meson.build | 1 + src/intel/meson.build | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/intel/common/gen_decoder.c b/src/intel/common/gen_decoder.c index 87a81b4b05a..7ca71c0d9fc 100644 --- a/src/intel/common/gen_decoder.c +++ b/src/intel/common/gen_decoder.c @@ -35,6 +35,7 @@ #include "gen_decoder.h" +#include "isl/isl.h" #include "genxml/genX_xml.h" #define XML_BUFFER_SIZE 4096 @@ -954,6 +955,13 @@ iter_decode_field(struct gen_field_iterator *iter) int length = strlen(iter->value); snprintf(iter->value + length, sizeof(iter->value) - length, " (%s)", enum_name); + } else if (strcmp(iter->name, "Surface Format") == 0) { + if (isl_format_is_valid((enum isl_format)v.qw)) { + const char *fmt_name = isl_format_get_name((enum isl_format)v.qw); + int length = strlen(iter->value); + snprintf(iter->value + length, sizeof(iter->value) - length, + " (%s)", fmt_name); + } } } diff --git a/src/intel/common/meson.build b/src/intel/common/meson.build index d35d5e8f78e..5e0394a5b86 100644 --- a/src/intel/common/meson.build +++ b/src/intel/common/meson.build @@ -38,5 +38,6 @@ libintel_common = static_library( files_libintel_common, include_directories : [inc_common, inc_intel], c_args : [c_vis_args, no_override_init_args], + link_with : [libisl], dependencies : [dep_expat, dep_libdrm, dep_thread], ) diff --git a/src/intel/meson.build b/src/intel/meson.build index 28a2d793509..ccaf16a76f9 100644 --- a/src/intel/meson.build +++ b/src/intel/meson.build @@ -23,8 +23,8 @@ inc_intel = include_directories('.') subdir('blorp') subdir('dev') subdir('genxml') -subdir('common') subdir('isl') +subdir('common') subdir('compiler') subdir('tools') if with_intel_vk -- 2.30.2