From 7770b026937948e1be3ed55f9ff97e6521c500df Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Fri, 21 Feb 2014 23:52:24 -0800 Subject: [PATCH] Revert "i965/fs: Make fs_reg's type an enum for better debugging." This reverts commit 5ceadd29b0af835d741bcf09b9622c628e549ae6. I rebased and apparently failed to build test. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=75355 --- src/mesa/drivers/dri/i965/brw_fs.cpp | 4 ++-- src/mesa/drivers/dri/i965/brw_fs.h | 4 ++-- src/mesa/drivers/dri/i965/brw_shader.cpp | 2 +- src/mesa/drivers/dri/i965/brw_shader.h | 3 +-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp index a88c621d047..e1a7d2d393c 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp @@ -424,7 +424,7 @@ fs_reg::fs_reg(struct brw_reg fixed_hw_reg) init(); this->file = HW_REG; this->fixed_hw_reg = fixed_hw_reg; - this->type = (enum brw_reg_type)fixed_hw_reg.type; + this->type = fixed_hw_reg.type; } bool @@ -837,7 +837,7 @@ fs_reg::fs_reg(enum register_file file, int reg) } /** Fixed HW reg constructor. */ -fs_reg::fs_reg(enum register_file file, int reg, enum brw_reg_type type) +fs_reg::fs_reg(enum register_file file, int reg, uint32_t type) { init(); this->file = file; diff --git a/src/mesa/drivers/dri/i965/brw_fs.h b/src/mesa/drivers/dri/i965/brw_fs.h index fff7d8e474d..86c95dfb124 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.h +++ b/src/mesa/drivers/dri/i965/brw_fs.h @@ -74,7 +74,7 @@ public: fs_reg(uint32_t u); fs_reg(struct brw_reg fixed_hw_reg); fs_reg(enum register_file file, int reg); - fs_reg(enum register_file file, int reg, enum brw_reg_type type); + fs_reg(enum register_file file, int reg, uint32_t type); fs_reg(class fs_visitor *v, const struct glsl_type *type); bool equals(const fs_reg &r) const; @@ -91,7 +91,7 @@ public: /** Register file: GRF, MRF, IMM. */ enum register_file file; /** Register type. BRW_REGISTER_TYPE_* */ - enum brw_reg_type type; + uint8_t type; /** * Register number. For MRF, it's the hardware register. For * GRF, it's a virtual register number until register allocation diff --git a/src/mesa/drivers/dri/i965/brw_shader.cpp b/src/mesa/drivers/dri/i965/brw_shader.cpp index a436ee9e952..08ceca1571a 100644 --- a/src/mesa/drivers/dri/i965/brw_shader.cpp +++ b/src/mesa/drivers/dri/i965/brw_shader.cpp @@ -282,7 +282,7 @@ brw_link_shader(struct gl_context *ctx, struct gl_shader_program *shProg) } -enum brw_reg_type +int brw_type_for_base_type(const struct glsl_type *type) { switch (type->base_type) { diff --git a/src/mesa/drivers/dri/i965/brw_shader.h b/src/mesa/drivers/dri/i965/brw_shader.h index bbbeb326861..4d98cbcdbb5 100644 --- a/src/mesa/drivers/dri/i965/brw_shader.h +++ b/src/mesa/drivers/dri/i965/brw_shader.h @@ -23,7 +23,6 @@ #include #include "brw_defines.h" -#include "brw_reg.h" #include "main/compiler.h" #include "glsl/ir.h" @@ -100,7 +99,7 @@ uint32_t brw_texture_offset(struct gl_context *ctx, ir_constant *offset); #endif /* __cplusplus */ -enum brw_reg_type brw_type_for_base_type(const struct glsl_type *type); +int brw_type_for_base_type(const struct glsl_type *type); uint32_t brw_conditional_for_comparison(unsigned int op); uint32_t brw_math_function(enum opcode op); const char *brw_instruction_name(enum opcode op); -- 2.30.2