fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-19 03:40:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

compiler/types: Move static asserts about glsl_type to a central place

Browse source 
Take it out of the way to reduce noise when reworking (and eventually
removing) the constructor code.

Reviewed-by: Emma Anholt <emma@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25006>
This commit is contained in:
Caio Oliveira 2023-09-01 00:36:29 -07:00 • committed by Marge Bot
parent 7815f3cd3e
commit 492644dbef
2 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/compiler/glsl_types.cpp
View file

@ -78,18 +78,6 @@ glsl_type::glsl_type(void *mem_ctx, uint32_t gl_type,
length(0), explicit_stride(explicit_stride),
explicit_alignment(explicit_alignment)
{
/* Values of these types must fit in the two bits of
* glsl_type::sampled_type.
*/
STATIC_ASSERT((unsigned(GLSL_TYPE_UINT) & 3) == unsigned(GLSL_TYPE_UINT));
STATIC_ASSERT((unsigned(GLSL_TYPE_INT) & 3) == unsigned(GLSL_TYPE_INT));
STATIC_ASSERT((unsigned(GLSL_TYPE_FLOAT) & 3) == unsigned(GLSL_TYPE_FLOAT));
ASSERT_BITFIELD_SIZE(glsl_type, base_type, GLSL_TYPE_ERROR);
ASSERT_BITFIELD_SIZE(glsl_type, sampled_type, GLSL_TYPE_ERROR);
ASSERT_BITFIELD_SIZE(glsl_type, sampler_dimensionality,
GLSL_SAMPLER_DIM_SUBPASS_MS);
assert(mem_ctx != NULL);
assert(name != NULL);
@ -462,6 +450,18 @@ const glsl_type *glsl_type::get_uint16_type() const
void
glsl_type_singleton_init_or_ref()
{
/* Values of these types must fit in the two bits of
* glsl_type::sampled_type.
*/
STATIC_ASSERT((unsigned(GLSL_TYPE_UINT) & 3) == unsigned(GLSL_TYPE_UINT));
STATIC_ASSERT((unsigned(GLSL_TYPE_INT) & 3) == unsigned(GLSL_TYPE_INT));
STATIC_ASSERT((unsigned(GLSL_TYPE_FLOAT) & 3) == unsigned(GLSL_TYPE_FLOAT));
ASSERT_BITFIELD_SIZE(glsl_type, base_type, GLSL_TYPE_ERROR);
ASSERT_BITFIELD_SIZE(glsl_type, sampled_type, GLSL_TYPE_ERROR);
ASSERT_BITFIELD_SIZE(glsl_type, sampler_dimensionality,
GLSL_SAMPLER_DIM_SUBPASS_MS);
simple_mtx_lock(&glsl_type_cache_mutex);
if (glsl_type_cache.users == 0)
glsl_type_cache.mem_ctx = ralloc_context(NULL);

2
src/compiler/glsl_types.h
View file

@ -323,13 +323,11 @@ struct glsl_type {
*/
unsigned packed:1;
private:
glsl_type()
{
// Dummy constructor, just for the sake of ASSERT_BITFIELD_SIZE.
}
public:
/**
* \name Vector and matrix element counts
*