diff options
| author | Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com> | 2020-09-11 15:45:48 +0200 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2020-09-24 09:32:13 -0700 |
| commit | 6394d94536075ad94e45e0dc427d542a72e62c5b (patch) | |
| tree | d4d416a6318fdefe8f157b23a166c1202b825165 | |
| parent | 2b496c9bd21fa176e7eeb7632bdcd63c9aeb4abd (diff) | |
glsl: fix per_vertex_accumulator::fields size
49d35f3d882bd0f4418a1ce056344b8f06bd75dd moved gl_Layer/gl_ViewportIndex/gl_ViewportMask
as builtins but fields size wasn't increased.
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3508
Fixes: 49d35f3d882 ("glsl: declare gl_Layer/gl_ViewportIndex/gl_ViewportMask as vs builtins")
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6688>
(cherry picked from commit 8a2a9e9bb8879cf3e88870fc5ff4c36e190fa012)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/compiler/glsl/builtin_variables.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json index 95abee48314..f75d7b5dc7c 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2074,7 +2074,7 @@ "description": "glsl: fix per_vertex_accumulator::fields size", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "49d35f3d882bd0f4418a1ce056344b8f06bd75dd" }, diff --git a/src/compiler/glsl/builtin_variables.cpp b/src/compiler/glsl/builtin_variables.cpp index 24d0d403328..869d4523f6c 100644 --- a/src/compiler/glsl/builtin_variables.cpp +++ b/src/compiler/glsl/builtin_variables.cpp @@ -319,7 +319,7 @@ public: const glsl_type *construct_interface_instance() const; private: - glsl_struct_field fields[11]; + glsl_struct_field fields[14]; unsigned num_fields; }; |