fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-01 18:58:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa/ffvs: Use gl_state_index16 in helpers directly

Browse source 
register_state_var will have to convert everything to gl_state_index16 and the
values given to it are already either gl_state_index or any short integer which
are covered by the gl_state_index16 type.

Signed-off-by: Corentin Noël <corentin.noel@collabora.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26067>
This commit is contained in:
Corentin Noël 2023-11-06 12:39:24 +01:00 • committed by Marge Bot
parent e61287888d
commit 5f2f75aa67
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/mesa/main/ffvertex_prog.c
View file

@ -296,10 +296,10 @@ struct tnl_program {
static nir_variable *
register_state_var(struct tnl_program *p,
gl_state_index s0,
gl_state_index s1,
gl_state_index s2,
gl_state_index s3,
gl_state_index16 s0,
gl_state_index16 s1,
gl_state_index16 s2,
gl_state_index16 s3,
const struct glsl_type *type)
{
gl_state_index16 tokens[STATE_LENGTH];
@ -319,10 +319,10 @@ register_state_var(struct tnl_program *p,
static nir_def *
load_state_var(struct tnl_program *p,
gl_state_index s0,
gl_state_index s1,
gl_state_index s2,
gl_state_index s3,
gl_state_index16 s0,
gl_state_index16 s1,
gl_state_index16 s2,
gl_state_index16 s3,
const struct glsl_type *type)
{
nir_variable *var = register_state_var(p, s0, s1, s2, s3, type);
@ -331,10 +331,10 @@ load_state_var(struct tnl_program *p,
static nir_def *
load_state_vec4(struct tnl_program *p,
gl_state_index s0,
gl_state_index s1,
gl_state_index s2,
gl_state_index s3)
gl_state_index16 s0,
gl_state_index16 s1,
gl_state_index16 s2,
gl_state_index16 s3)
{
return load_state_var(p, s0, s1, s2, s3, glsl_vec4_type());
}