Mesa (staging/19.1): intel/compiler: don't use a keyword struct for a class fs_reg

[GitLab Mirror]

Module: Mesa
Branch: staging/19.1
Commit: 61117d653e3401dc3165cdfb8140b97848efa1d4
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=61117d653e3401dc3165cdfb8140b97848efa1d4

Author: Andrii Simiklit <andrii.simiklit at globallogic.com>
Date:   Tue Jul 23 14:48:58 2019 +0300

intel/compiler: don't use a keyword struct for a class fs_reg

warning: struct 'fs_reg' was previously declared as a class
Fixes: e64be391 ("intel/compiler: generalize the combine constants pass")
Reviewed-by: Eric Engestrom <eric.engestrom at intel.com>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
Signed-off-by: Andrii Simiklit <andrii.simiklit at globallogic.com>
(cherry picked from commit fa2fc68de132317ce63d407cef34e266c1d3e838)

---

 src/intel/compiler/brw_fs_combine_constants.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/intel/compiler/brw_fs_combine_constants.cpp b/src/intel/compiler/brw_fs_combine_constants.cpp
index 8d16be4c4bb..c12e0d62293 100644
--- a/src/intel/compiler/brw_fs_combine_constants.cpp
+++ b/src/intel/compiler/brw_fs_combine_constants.cpp
@@ -289,7 +289,7 @@ get_alignment_for_imm(const struct imm *imm)
 }
 
 static bool
-needs_negate(const struct fs_reg *reg, const struct imm *imm)
+needs_negate(const fs_reg *reg, const struct imm *imm)
 {
    switch (reg->type) {
    case BRW_REGISTER_TYPE_DF: