mesa/glsl: move TransformFeedbackBufferStride to gl_shader

Here we remove the single use of this field in gl_linked_shader
which allows us to move the field out of gl_shader_info

While we are at it we rewrite link_xfb_stride_layout_qualifiers()
to be more clear.

Reviewed-by: Lionel Landwerlin <[email protected]>

1 files changed, 3 insertions, 5 deletions

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index d036958f9d0..f04ec51d52c 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2242,11 +2242,6 @@ struct gl_subroutine_function
  */
 struct gl_shader_info
 {
-   struct {
-      /** Global xfb_stride out qualifier if any */
-      GLuint BufferStride[MAX_FEEDBACK_BUFFERS];
-   } TransformFeedback;
-
    /**
     * Tessellation Control shader state from layout qualifiers.
     */
@@ -2436,6 +2431,9 @@ struct gl_shader
    bool origin_upper_left;
    bool pixel_center_integer;
 
+   /** Global xfb_stride out qualifier if any */
+   GLuint TransformFeedbackBufferStride[MAX_FEEDBACK_BUFFERS];
+
    struct gl_shader_info info;
 };