diff options
| author | Paul Berry <[email protected]> | 2013-01-29 05:52:47 -0800 |
|---|---|---|
| committer | Paul Berry <[email protected]> | 2013-02-04 10:36:44 -0800 |
| commit | 53febac02c382fa163a9ad7280fc5f4d2707a665 (patch) | |
| tree | 32af700cc40b057271d17f6a89851fa2c614a7b3 /src/glsl/link_varyings.h | |
| parent | b4db34cc4c047427a21efb9bde03d7e125f70e55 (diff) | |
glsl: Use parse_program_resource_name to parse transform feedback varyings.
Previously, transform feedback varyings were parsed in an ad-hoc
fashion that wasn't compatible with structs (or array of structs).
This patch makes it use parse_program_resource_name(), which correctly
handles both.
Note that parse_program_resource_name()'s technique for handling
mal-formed input strings is to simply let them through and rely on the
fact that a future name lookup will fail. Because of this,
tfeedback_decl::init() no longer needs to return a boolean error
code--it always succeeds, and if the input was mal-formed the error
will be detected later.
NOTE: This is a candidate for the 9.1 branch.
Reviewed-by: Jordan Justen <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
Diffstat (limited to 'src/glsl/link_varyings.h')
| -rw-r--r-- | src/glsl/link_varyings.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/link_varyings.h b/src/glsl/link_varyings.h index 057e4b21925..806bd1c470f 100644 --- a/src/glsl/link_varyings.h +++ b/src/glsl/link_varyings.h @@ -48,7 +48,7 @@ class ir_variable; class tfeedback_decl { public: - bool init(struct gl_context *ctx, struct gl_shader_program *prog, + void init(struct gl_context *ctx, struct gl_shader_program *prog, const void *mem_ctx, const char *input); static bool is_same(const tfeedback_decl &x, const tfeedback_decl &y); bool assign_location(struct gl_context *ctx, struct gl_shader_program *prog, |