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

glsl_types: fix build break with intel/msvc compiler

Browse Source 
The VECN() macro was taking advantage of a GCC specific feature that is
not available on lesser compilers, mostly for the purposes of avoiding a
macro that encoded a return statement.

But as suggested by Ian, we could just have the macro produce the entire
method body and avoid the need for this.  So let's do that instead.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105740
Fixes: f407edf340
Cc: Emil Velikov <emil.velikov@collabora.com>
Cc: Timothy Arceri <tarceri@itsqueeze.com>
Cc: Roland Scheidegger <sroland@vmware.com>
Cc: Ian Romanick <idr@freedesktop.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>
Acked-by: Timothy Arceri <tarceri@itsqueeze.com>
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Rob Clark
2018-03-26 18:45:07 -04:00
parent 41cf30b8bc
commit 1e0a06000b
1 changed files with 22 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
src/compiler/glsl_types.cpp
View File

@@ -509,89 +509,30 @@ glsl_type::vec(unsigned components, const glsl_type *const ts[])
return ts[n - 1];
}
#define VECN(components, sname, vname) ({ \
static const glsl_type *const ts[] = { \
sname ## _type, vname ## 2_type, \
vname ## 3_type, vname ## 4_type, \
vname ## 8_type, vname ## 16_type, \
}; \
glsl_type::vec(components, ts); \
})
const glsl_type *
glsl_type::vec(unsigned components)
{
return VECN(components, float, vec);
#define VECN(components, sname, vname) \
const glsl_type * \
glsl_type:: vname (unsigned components) \
{ \
static const glsl_type *const ts[] = { \
sname ## _type, vname ## 2_type, \
vname ## 3_type, vname ## 4_type, \
vname ## 8_type, vname ## 16_type, \
}; \
return glsl_type::vec(components, ts); \
}
const glsl_type *
glsl_type::f16vec(unsigned components)
{
return VECN(components, float16_t, f16vec);
}
const glsl_type *
glsl_type::dvec(unsigned components)
{
return VECN(components, double, dvec);
}
const glsl_type *
glsl_type::ivec(unsigned components)
{
return VECN(components, int, ivec);
}
const glsl_type *
glsl_type::uvec(unsigned components)
{
return VECN(components, uint, uvec);
}
const glsl_type *
glsl_type::bvec(unsigned components)
{
return VECN(components, bool, bvec);
}
const glsl_type *
glsl_type::i64vec(unsigned components)
{
return VECN(components, int64_t, i64vec);
}
const glsl_type *
glsl_type::u64vec(unsigned components)
{
return VECN(components, uint64_t, u64vec);
}
const glsl_type *
glsl_type::i16vec(unsigned components)
{
return VECN(components, int16_t, i16vec);
}
const glsl_type *
glsl_type::u16vec(unsigned components)
{
return VECN(components, uint16_t, u16vec);
}
const glsl_type *
glsl_type::i8vec(unsigned components)
{
return VECN(components, int8_t, i8vec);
}
const glsl_type *
glsl_type::u8vec(unsigned components)
{
return VECN(components, uint8_t, u8vec);
}
VECN(components, float, vec)
VECN(components, float16_t, f16vec)
VECN(components, double, dvec)
VECN(components, int, ivec)
VECN(components, uint, uvec)
VECN(components, bool, bvec)
VECN(components, int64_t, i64vec)
VECN(components, uint64_t, u64vec)
VECN(components, int16_t, i16vec)
VECN(components, uint16_t, u16vec)
VECN(components, int8_t, i8vec)
VECN(components, uint8_t, u8vec)
const glsl_type *
glsl_type::get_instance(unsigned base_type, unsigned rows, unsigned columns)