← Back to branch summary

~ubuntu-branches/ubuntu/quantal/mesa/quantal

« back to all changes in this revision

Viewing changes to src/glsl/linker.h

  • Committer: Package Import Robot
  • Author(s): Timo Aaltonen
  • Date: 2012-08-23 15:37:30 UTC
  • mfrom: (1.7.6)
  • Revision ID: package-import@ubuntu.com-20120823153730-c499sefj7btu4386
Tags: 9.0~git20120821.c1114c61-0ubuntu1
https://launchpad.net/bugs/1009089
* Merge from unreleased debian git.
  - Includes support for ATI Trinity PCI IDs (LP: #1009089)
* rules, control, libgl1-mesa-swx11*: Remove swx11 support.
* Refresh patches:
  - drop 115_llvm_dynamic_linking.diff,
    117_nullptr_check_in_query_version.patch, and
    118_glsl_initialize_samplers.patch, all upstream
  - disable 116_use_shared_galliumcore.diff until it's reviewed and
    reworked to apply
* not-installed, libegl1-mesa-drivers-install.linux.in: Updated to
  match the single-pass build.
* libgl1-mesa-dri.*install.in: Drop libglsl.so, it's included in
  libdricore.so now.
* rules: Don't disable GLU on the common flags, we need to build it
  on the dri target.
* libglu*install.in: Fix the source file paths to match the build target.
  Drop the static lib from -dev since only shared libs get built.
* libgl1-mesa-dev.install.in: Fix the source file paths to match the
  build target.
* libgl1-mesa-dri.install.linux.in: Don't try to install libgallium.so,
  which isn't built yet.
* rules: Enable llvmpipe on armhf to see if it works or not.
* rules: Remove bin/install-sh on clean, and don't create a symlink for
  it.
* control: Add Pre-Depends on dpkg-dev due to the binaries using xz
  compression.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/glsl/linker.h
37
37
extern void
38
38
link_assign_uniform_locations(struct gl_shader_program *prog);
39
39
 
 
40
extern void
 
41
link_set_uniform_initializers(struct gl_shader_program *prog);
 
42
 
 
43
extern int
 
44
link_cross_validate_uniform_block(void *mem_ctx,
 
45
                                  struct gl_uniform_block **linked_blocks,
 
46
                                  unsigned int *num_linked_blocks,
 
47
                                  struct gl_uniform_block *new_block);
 
48
 
 
49
void
 
50
link_assign_uniform_block_offsets(struct gl_shader *shader);
 
51
 
40
52
/**
41
53
 * Class for processing all of the leaf fields of an uniform
42
54
 *
76
88
    * \param name_length  Length of the current name \b not including the
77
89
    *                     terminating \c NUL character.
78
90
    */
79
 
   void recursion(const glsl_type *t, char **name, unsigned name_length);
 
91
   void recursion(const glsl_type *t, char **name, size_t name_length);
80
92
};
81
93
 
82
94
#endif /* GLSL_LINKER_H */