diff options
| author | marha <marha@users.sourceforge.net> | 2013-10-25 08:48:17 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-10-25 08:48:17 +0200 |
| commit | 270d3a1aa4137dc15d7b7e5a0958cc8c0bef9a1a (patch) | |
| tree | fa640e591154a031fd5f02b7b5043689e47cc573 /mesalib/src/glsl/link_varyings.cpp | |
| parent | 4eb0b643ad978d94837e2d587a5d4358f974a25c (diff) | |
| download | vcxsrv-270d3a1aa4137dc15d7b7e5a0958cc8c0bef9a1a.tar.gz vcxsrv-270d3a1aa4137dc15d7b7e5a0958cc8c0bef9a1a.tar.bz2 vcxsrv-270d3a1aa4137dc15d7b7e5a0958cc8c0bef9a1a.zip | |
fontconfig mesa git update 25 oct 2013
fontconfig commit 65872e9e46d17e4461c3a891ef23abe156005e04
mesa commit e8f6f244bb1963c4af81f431865355beef1b9cbb
Diffstat (limited to 'mesalib/src/glsl/link_varyings.cpp')
| -rw-r--r-- | mesalib/src/glsl/link_varyings.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesalib/src/glsl/link_varyings.cpp b/mesalib/src/glsl/link_varyings.cpp index 4ba6d8a20..be36b5f8f 100644 --- a/mesalib/src/glsl/link_varyings.cpp +++ b/mesalib/src/glsl/link_varyings.cpp @@ -125,9 +125,9 @@ cross_validate_types_and_qualifiers(struct gl_shader_program *prog, "interpolation qualifier\n", _mesa_glsl_shader_target_name(producer_type), output->name, - output->interpolation_string(), + interpolation_string(output->interpolation), _mesa_glsl_shader_target_name(consumer_type), - input->interpolation_string()); + interpolation_string(input->interpolation)); return; } } @@ -328,7 +328,7 @@ tfeedback_decl::assign_location(struct gl_context *ctx, const unsigned vector_elements = this->matched_candidate->type->fields.array->vector_elements; unsigned actual_array_size = this->is_clip_distance_mesa ? - prog->Vert.ClipDistanceArraySize : + prog->LastClipDistanceArraySize : this->matched_candidate->type->array_size(); if (this->is_subscripted) { |