OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

isl: Fix some tautological-compare warnings

Browse Source 
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 <ben@bwidawsk.net>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
This commit is contained in:
Ben Widawsky
2016-05-26 21:59:17 -07:00
parent 4ccf8c952a
commit 8314dd7ff2
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/intel/isl/isl.c
View File

@@ -59,8 +59,8 @@ isl_device_init(struct isl_device *dev,
* device properties at buildtime. Verify that the macros with the device * device properties at buildtime. Verify that the macros with the device
* properties chosen during runtime. * properties chosen during runtime.
*/ */
assert(ISL_DEV_GEN(dev) == dev->info->gen); ISL_DEV_GEN_SANITIZE(dev);
assert(ISL_DEV_USE_SEPARATE_STENCIL(dev) == dev->use_separate_stencil); ISL_DEV_USE_SEPARATE_STENCIL_SANITIZE(dev);
/* Did we break hiz or stencil? */ /* Did we break hiz or stencil? */
if (ISL_DEV_USE_SEPARATE_STENCIL(dev)) if (ISL_DEV_USE_SEPARATE_STENCIL(dev))

8
src/intel/isl/isl.h
View File

@@ -59,6 +59,10 @@ struct brw_image_param;
* `gcc -DISL_DEV_GEN(dev)=9 ...`. * `gcc -DISL_DEV_GEN(dev)=9 ...`.
*/ */
#define ISL_DEV_GEN(__dev) ((__dev)->info->gen) #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 #endif
#ifndef ISL_DEV_IS_HASWELL #ifndef ISL_DEV_IS_HASWELL
@@ -77,6 +81,10 @@ struct brw_image_param;
* `gcc -DISL_DEV_USE_SEPARATE_STENCIL(dev)=1 ...`. * `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(__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 #endif
/** /**