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

intel/compiler: Use C99 array initializers for prog_data/key sizes

Browse Source 
This is way better than a pile of STATIC_ASSERTs.

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6280>
This commit is contained in:
Caio Marcelo de Oliveira Filho
2020-02-19 10:47:20 -06:00
committed by Marge Bot
parent 8e1de8e5ac
commit e2b6ccbdad
1 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/intel/compiler/brw_compiler.c
View File

@@ -240,19 +240,13 @@ brw_get_compiler_config_value(const struct brw_compiler *compiler)
unsigned
brw_prog_data_size(gl_shader_stage stage)
{
STATIC_ASSERT(MESA_SHADER_VERTEX == 0);
STATIC_ASSERT(MESA_SHADER_TESS_CTRL == 1);
STATIC_ASSERT(MESA_SHADER_TESS_EVAL == 2);
STATIC_ASSERT(MESA_SHADER_GEOMETRY == 3);
STATIC_ASSERT(MESA_SHADER_FRAGMENT == 4);
STATIC_ASSERT(MESA_SHADER_COMPUTE == 5);
static const size_t stage_sizes[] = {
sizeof(struct brw_vs_prog_data),
sizeof(struct brw_tcs_prog_data),
sizeof(struct brw_tes_prog_data),
sizeof(struct brw_gs_prog_data),
sizeof(struct brw_wm_prog_data),
sizeof(struct brw_cs_prog_data),
[MESA_SHADER_VERTEX] = sizeof(struct brw_vs_prog_data),
[MESA_SHADER_TESS_CTRL] = sizeof(struct brw_tcs_prog_data),
[MESA_SHADER_TESS_EVAL] = sizeof(struct brw_tes_prog_data),
[MESA_SHADER_GEOMETRY] = sizeof(struct brw_gs_prog_data),
[MESA_SHADER_FRAGMENT] = sizeof(struct brw_wm_prog_data),
[MESA_SHADER_COMPUTE] = sizeof(struct brw_cs_prog_data),
};
assert((int)stage >= 0 && stage < ARRAY_SIZE(stage_sizes));
return stage_sizes[stage];
@@ -262,12 +256,12 @@ unsigned
brw_prog_key_size(gl_shader_stage stage)
{
static const size_t stage_sizes[] = {
sizeof(struct brw_vs_prog_key),
sizeof(struct brw_tcs_prog_key),
sizeof(struct brw_tes_prog_key),
sizeof(struct brw_gs_prog_key),
sizeof(struct brw_wm_prog_key),
sizeof(struct brw_cs_prog_key),
[MESA_SHADER_VERTEX] = sizeof(struct brw_vs_prog_key),
[MESA_SHADER_TESS_CTRL] = sizeof(struct brw_tcs_prog_key),
[MESA_SHADER_TESS_EVAL] = sizeof(struct brw_tes_prog_key),
[MESA_SHADER_GEOMETRY] = sizeof(struct brw_gs_prog_key),
[MESA_SHADER_FRAGMENT] = sizeof(struct brw_wm_prog_key),
[MESA_SHADER_COMPUTE] = sizeof(struct brw_cs_prog_key),
};
assert((int)stage >= 0 && stage < ARRAY_SIZE(stage_sizes));
return stage_sizes[stage];