diff options
| author | Ben Widawsky <[email protected]> | 2016-05-26 21:59:17 -0700 |
|---|---|---|
| committer | Ben Widawsky <[email protected]> | 2016-05-26 21:59:17 -0700 |
| commit | 8314dd7ff2c4719ffb64b202cf5fdd0e38ad276e (patch) | |
| tree | 913c4fadf99700600baf2d74486845a1c156edb5 | |
| parent | 4ccf8c952abb471f94d6f40786d896723f94c0ea (diff) | |
isl: Fix some tautological-compare warnings
Fixes:
isl.c:62:22: warning: self-comparison always evaluates to true [-Wtautological-compare]
assert(ISL_DEV_GEN(dev) == dev->info->gen);
^~
isl.c:63:33: warning: self-comparison always evaluates to true [-Wtautological-compare]
assert(ISL_DEV_USE_SEPARATE_STENCIL(dev) == dev->use_separate_stencil);
Signed-off-by: Ben Widawsky <[email protected]>
Reviewed-by: Anuj Phogat <[email protected]>
| -rw-r--r-- | src/intel/isl/isl.c | 4 | ||||
| -rw-r--r-- | src/intel/isl/isl.h | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c index e4bca1689cf..77b570df3cd 100644 --- a/src/intel/isl/isl.c +++ b/src/intel/isl/isl.c @@ -59,8 +59,8 @@ isl_device_init(struct isl_device *dev, * device properties at buildtime. Verify that the macros with the device * properties chosen during runtime. */ - assert(ISL_DEV_GEN(dev) == dev->info->gen); - assert(ISL_DEV_USE_SEPARATE_STENCIL(dev) == dev->use_separate_stencil); + ISL_DEV_GEN_SANITIZE(dev); + ISL_DEV_USE_SEPARATE_STENCIL_SANITIZE(dev); /* Did we break hiz or stencil? */ if (ISL_DEV_USE_SEPARATE_STENCIL(dev)) diff --git a/src/intel/isl/isl.h b/src/intel/isl/isl.h index daa5428f9f3..ef862282a2a 100644 --- a/src/intel/isl/isl.h +++ b/src/intel/isl/isl.h @@ -59,6 +59,10 @@ struct brw_image_param; * `gcc -DISL_DEV_GEN(dev)=9 ...`. */ #define ISL_DEV_GEN(__dev) ((__dev)->info->gen) +#define ISL_DEV_GEN_SANITIZE(__dev) +#else +#define ISL_DEV_GEN_SANITIZE(__dev) \ + (assert(ISL_DEV_GEN(__dev) == (__dev)->info->gen)) #endif #ifndef ISL_DEV_IS_HASWELL @@ -77,6 +81,10 @@ struct brw_image_param; * `gcc -DISL_DEV_USE_SEPARATE_STENCIL(dev)=1 ...`. */ #define ISL_DEV_USE_SEPARATE_STENCIL(__dev) ((__dev)->use_separate_stencil) +#define ISL_DEV_USE_SEPARATE_STENCIL_SANITIZE(__dev) +#else +#define ISL_DEV_USE_SEPARATE_STENCIL_SANITIZE(__dev) \ + (assert(ISL_DEV_USE_SEPARATE_STENCIL(__dev) == (__dev)->use_separate_stencil)) #endif /** |