commit 9419289743efb6a6ccd0a847253a603e98f8c9cc
author Chia-I Wu <olvaffe@gmail.com> Fri Aug 08 21:27:45 2014 +0800
committer Chia-I Wu <olvaffe@gmail.com> Fri Aug 08 21:28:23 2014 +0800
tree 17719188354984a1958093262766ab6fc07e4080
parent ac6ba13f159dc8325daccae0d565a1b6c40ada8f

intel: minor cleanup for intel_format_get_color_features

Forgot to commit this.

icd/intel/format.c

diff --git a/icd/intel/format.c b/icd/intel/format.c
index fe801db..41d9aae 100644
--- a/icd/intel/format.c
+++ b/icd/intel/format.c
@@ -417,7 +417,6 @@
 static XGL_FLAGS intel_format_get_color_features(const struct intel_dev *dev,
                                                  XGL_FORMAT format)
 {
-    const int gen = intel_gpu_gen(dev->gpu);
     const int fmt = intel_format_translate_color(format);
     const struct intel_sampler_cap *sampler;
     const struct intel_dp_cap *dp;
@@ -432,21 +431,22 @@
 
     features = XGL_FORMAT_MEMORY_SHADER_ACCESS_BIT;
 
-#define TEST(func, cap, gen) ((func) && (func)->cap && (gen) >= (func)->cap)
-    if (TEST(sampler, sampling, gen)) {
+#define TEST(dev, func, cap) ((func) && (func)->cap && \
+        intel_gpu_gen((dev)->gpu) >= (func)->cap)
+    if (TEST(dev, sampler, sampling)) {
         if (format.numericFormat == XGL_NUM_FMT_UINT ||
             format.numericFormat == XGL_NUM_FMT_SINT ||
-            TEST(sampler, filtering, gen))
+            TEST(dev, sampler, filtering))
             features |= XGL_FORMAT_IMAGE_SHADER_READ_BIT;
     }
 
-    if (TEST(dp, typed_write, gen))
+    if (TEST(dev, dp, typed_write))
         features |= XGL_FORMAT_IMAGE_SHADER_WRITE_BIT;
 
-    if (TEST(dp, rt_write, gen)) {
+    if (TEST(dev, dp, rt_write)) {
         features |= XGL_FORMAT_COLOR_ATTACHMENT_WRITE_BIT;
 
-        if (TEST(dp, rt_write_blending, gen))
+        if (TEST(dev, dp, rt_write_blending))
             features |= XGL_FORMAT_COLOR_ATTACHMENT_BLEND_BIT;
 
         if (features & XGL_FORMAT_IMAGE_SHADER_READ_BIT) {