fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 23:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

i965: Use scope operator to ensure brw_reg is interpreted as a type.

Browse source 
In the next patch, I make backend_reg's inheritance from brw_reg
private, which confuses clang when it sees the type "struct brw_reg" in
the derived class constructors, thinking it is referring to the
privately inherited brw_reg:

brw_fs.cpp:366:23: error: 'brw_reg' is a private member of 'brw_reg'
fs_reg::fs_reg(struct brw_reg reg) :
                      ^
brw_shader.h:39:22: note: constrained by private inheritance here
struct backend_reg : private brw_reg
                     ^~~~~~~~~~~~~~~
brw_reg.h:232:8: note: member is declared here
struct brw_reg {
       ^

Avoid this by marking brw_reg with the scope resolution operator.
This commit is contained in:
Matt Turner 2015-11-23 16:17:28 -08:00
parent f093c842e6
commit 799f924073
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/drivers/dri/i965/brw_fs.cpp
View file

@ -375,7 +375,7 @@ fs_reg::fs_reg()
this->file = BAD_FILE;
}
fs_reg::fs_reg(struct brw_reg reg) :
fs_reg::fs_reg(struct ::brw_reg reg) :
backend_reg(reg)
{
this->reg_offset = 0;

2
src/mesa/drivers/dri/i965/brw_ir_fs.h
View file

@ -36,7 +36,7 @@ public:
void init();
fs_reg();
fs_reg(struct brw_reg reg);
fs_reg(struct ::brw_reg reg);
fs_reg(enum brw_reg_file file, int nr);
fs_reg(enum brw_reg_file file, int nr, enum brw_reg_type type);

4
src/mesa/drivers/dri/i965/brw_ir_vec4.h
View file

@ -41,7 +41,7 @@ public:
src_reg(enum brw_reg_file file, int nr, const glsl_type *type);
src_reg();
src_reg(struct brw_reg reg);
src_reg(struct ::brw_reg reg);
bool equals(const src_reg &r) const;
@ -108,7 +108,7 @@ public:
unsigned writemask);
dst_reg(enum brw_reg_file file, int nr, brw_reg_type type,
unsigned writemask);
dst_reg(struct brw_reg reg);
dst_reg(struct ::brw_reg reg);
dst_reg(class vec4_visitor *v, const struct glsl_type *type);
explicit dst_reg(const src_reg &reg);

4
src/mesa/drivers/dri/i965/brw_vec4.cpp
View file

@ -71,7 +71,7 @@ src_reg::src_reg()
init();
}
src_reg::src_reg(struct brw_reg reg) :
src_reg::src_reg(struct ::brw_reg reg) :
backend_reg(reg)
{
this->reg_offset = 0;
@ -128,7 +128,7 @@ dst_reg::dst_reg(enum brw_reg_file file, int nr, brw_reg_type type,
this->writemask = writemask;
}
dst_reg::dst_reg(struct brw_reg reg) :
dst_reg::dst_reg(struct ::brw_reg reg) :
backend_reg(reg)
{
this->reg_offset = 0;