Mesa (master): glsl: fix per_vertex_accumulator::fields size

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Mon Sep 14 13:44:28 UTC 2020


Module: Mesa
Branch: master
Commit: 8a2a9e9bb8879cf3e88870fc5ff4c36e190fa012
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8a2a9e9bb8879cf3e88870fc5ff4c36e190fa012

Author: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Date:   Fri Sep 11 15:45:48 2020 +0200

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 at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6688>

---

 src/compiler/glsl/builtin_variables.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
 };
 



More information about the mesa-commit mailing list