glsl: Delete linker stuff relating to built-in functions.

[mesa.git] / src / compiler / glsl / linker.h

diff --git a/src/compiler/glsl/linker.h b/src/compiler/glsl/linker.h
index a60bb6ed087fc2f87129e0bb58536238d1876036..e1a53d20db2b7af4592ccf158d5b32ed6fc4620e 100644 (file)
--- a/src/compiler/glsl/linker.h
+++ b/src/compiler/glsl/linker.h
@@ -27,7 +27,7 @@
 #define GLSL_LINKER_H
 
 extern bool
-link_function_calls(gl_shader_program *prog, gl_shader *main,
+link_function_calls(gl_shader_program *prog, gl_linked_shader *main,
                    gl_shader **shader_list, unsigned num_shaders);
 
 extern void
@@ -49,17 +49,15 @@ link_cross_validate_uniform_block(void *mem_ctx,
                                  unsigned int *num_linked_blocks,
                                  struct gl_uniform_block *new_block);
 
-extern bool
-link_uniform_blocks_are_compatible(const gl_uniform_block *a,
-                                  const gl_uniform_block *b);
-
-extern unsigned
+extern void
 link_uniform_blocks(void *mem_ctx,
                     struct gl_context *ctx,
                     struct gl_shader_program *prog,
-                    struct gl_shader **shader_list,
-                    unsigned num_shaders,
-                    struct gl_uniform_block **blocks_ret);
+                    struct gl_linked_shader *shader,
+                    struct gl_uniform_block **ubo_blocks,
+                    unsigned *num_ubo_blocks,
+                    struct gl_uniform_block **ssbo_blocks,
+                    unsigned *num_ssbo_blocks);
 
 bool
 validate_intrastage_arrays(struct gl_shader_program *prog,
@@ -73,12 +71,12 @@ validate_intrastage_interface_blocks(struct gl_shader_program *prog,
 
 void
 validate_interstage_inout_blocks(struct gl_shader_program *prog,
-                                 const gl_shader *producer,
-                                 const gl_shader *consumer);
+                                 const gl_linked_shader *producer,
+                                 const gl_linked_shader *consumer);
 
 void
 validate_interstage_uniform_blocks(struct gl_shader_program *prog,
-                                   gl_shader **stages, int num_stages);
+                                   gl_linked_shader **stages);
 
 extern void
 link_assign_atomic_counter_resources(struct gl_context *ctx,
@@ -153,7 +151,7 @@ protected:
     */
    virtual void visit_field(const glsl_type *type, const char *name,
                             bool row_major, const glsl_type *record_type,
-                            const unsigned packing,
+                            const enum glsl_interface_packing packing,
                             bool last_field);
 
    /**
@@ -177,10 +175,12 @@ protected:
    virtual void visit_field(const glsl_struct_field *field);
 
    virtual void enter_record(const glsl_type *type, const char *name,
-                             bool row_major, const unsigned packing);
+                             bool row_major, const enum glsl_interface_packing packing);
 
    virtual void leave_record(const glsl_type *type, const char *name,
-                             bool row_major, const unsigned packing);
+                             bool row_major, const enum glsl_interface_packing packing);
+
+   virtual void set_buffer_offset(unsigned offset);
 
    virtual void set_record_array_count(unsigned record_array_count);
 
@@ -194,8 +194,9 @@ private:
     */
    void recursion(const glsl_type *t, char **name, size_t name_length,
                   bool row_major, const glsl_type *record_type,
-                  const unsigned packing,
-                  bool last_field, unsigned record_array_count);
+                  const enum glsl_interface_packing packing,
+                  bool last_field, unsigned record_array_count,
+                  const glsl_struct_field *named_ifc_member);
 };
 
 void