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

compiler/types: Fix glsl_dvec*_type() helpers

Browse source 
Commit 90e364edb0 contained a typo in the glsl_dvec4_type() helper,
instead returning a glsl_ivec4_type. As an ivec4 is 2x smaller than
a dvec4, this also broke piglit sanity on crocus/hsw.

This also fixes the dvec2 helper, though it has not been specifically
tested anywhere.

Fixes: 90e364edb0 ("compiler/types: Add a few more helpers to get builtin types")

Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27917>
(cherry picked from commit f9acfeeb59)
This commit is contained in:
Oskar Viljasaar 2024-03-01 16:44:37 +02:00 • committed by Eric Engestrom
parent cf7f7e700e
commit eb07359061
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -1374,7 +1374,7 @@
"description": "compiler/types: Fix glsl_dvec*_type() helpers",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "90e364edb078e0568b266b8fd1e5da8ca74f7a15",
"notes": null

4
src/compiler/glsl_types.h
View file

@ -924,12 +924,12 @@ static inline const glsl_type *glsl_float_type(void) { return &glsl_type_builtin
static inline const glsl_type *glsl_float16_t_type(void) { return &glsl_type_builtin_float16_t; }
static inline const glsl_type *glsl_double_type(void) { return &glsl_type_builtin_double; }
static inline const glsl_type *glsl_vec2_type(void) { return &glsl_type_builtin_vec2; }
static inline const glsl_type *glsl_dvec2_type(void) { return &glsl_type_builtin_ivec2; }
static inline const glsl_type *glsl_dvec2_type(void) { return &glsl_type_builtin_dvec2; }
static inline const glsl_type *glsl_uvec2_type(void) { return &glsl_type_builtin_uvec2; }
static inline const glsl_type *glsl_ivec2_type(void) { return &glsl_type_builtin_ivec2; }
static inline const glsl_type *glsl_bvec2_type(void) { return &glsl_type_builtin_bvec2; }
static inline const glsl_type *glsl_vec4_type(void) { return &glsl_type_builtin_vec4; }
static inline const glsl_type *glsl_dvec4_type(void) { return &glsl_type_builtin_ivec4; }
static inline const glsl_type *glsl_dvec4_type(void) { return &glsl_type_builtin_dvec4; }
static inline const glsl_type *glsl_uvec4_type(void) { return &glsl_type_builtin_uvec4; }
static inline const glsl_type *glsl_ivec4_type(void) { return &glsl_type_builtin_ivec4; }
static inline const glsl_type *glsl_bvec4_type(void) { return &glsl_type_builtin_bvec4; }