glsl/tests/warnings-test: correctly manage srcdir/builddir

[mesa.git] / src / compiler / shader_info.h

diff --git a/src/compiler/shader_info.h b/src/compiler/shader_info.h
index a44fcac23886eb427e5c5a9ccdabc72a5fa2429d..a67084156dd03d77988180b1deed6e009cce00bc 100644 (file)
--- a/src/compiler/shader_info.h
+++ b/src/compiler/shader_info.h
@@ -25,11 +25,16 @@
 #ifndef SHADER_INFO_H
 #define SHADER_INFO_H
 
+#include "shader_enums.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 typedef struct shader_info {
+   /** The shader stage, such as MESA_SHADER_VERTEX. */
+   gl_shader_stage stage;
+
    const char *name;
 
    /* Descriptive name provided by the client; may be NULL */
@@ -65,8 +70,11 @@ typedef struct shader_info {
    /* Whether or not this shader ever uses textureGather() */
    bool uses_texture_gather;
 
-   /* Whether or not this shader uses the gl_ClipDistance output */
-   bool uses_clip_distance_out;
+   /* The size of the gl_ClipDistance[] array, if declared. */
+   unsigned clip_distance_array_size;
+
+   /* The size of the gl_CullDistance[] array, if declared. */
+   unsigned cull_distance_array_size;
 
    /* Whether or not separate shader objects were used */
    bool separate_shader;
@@ -112,35 +120,42 @@ typedef struct shader_info {
           */
          bool early_fragment_tests;
 
+         /**
+          * Defined by INTEL_conservative_rasterization.
+          */
+         bool inner_coverage;
+
+         bool post_depth_coverage;
+
          /** gl_FragDepth layout for ARB_conservative_depth. */
          enum gl_frag_depth_layout depth_layout;
       } fs;
 
       struct {
          unsigned local_size[3];
+
+         bool local_size_variable;
+
+         /**
+          * Size of shared variables accessed by the compute shader.
+          */
+         unsigned shared_size;
       } cs;
 
+      /* Applies to both TCS and TES. */
       struct {
          /** The number of vertices in the TCS output patch. */
-         unsigned vertices_out;
-      } tcs;
+         unsigned tcs_vertices_out;
 
-      struct {
          uint32_t primitive_mode; /* GL_TRIANGLES, GL_QUADS or GL_ISOLINES */
-         uint32_t spacing;        /* GL_EQUAL, GL_FRACTIONAL_EVEN, GL_FRACTIONAL_ODD */
-         uint32_t vertex_order;   /* GL_CW or GL_CCW */
+         enum gl_tess_spacing spacing;
+         /** Is the vertex order counterclockwise? */
+         bool ccw;
          bool point_mode;
-      } tes;
+      } tess;
    };
 } shader_info;
 
-struct gl_shader_program;
-struct gl_linked_shader;
-
-void
-copy_shader_info(const struct gl_shader_program *shader_prog,
-                 struct gl_linked_shader *sh);
-
 #ifdef __cplusplus
 }
 #endif