diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/glsl/link_varyings.cpp | 10 | ||||
| -rw-r--r-- | src/compiler/glsl/linker.cpp | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/compiler/glsl/link_varyings.cpp b/src/compiler/glsl/link_varyings.cpp index 69b82d5448b..59ce1a2d285 100644 --- a/src/compiler/glsl/link_varyings.cpp +++ b/src/compiler/glsl/link_varyings.cpp @@ -1278,8 +1278,8 @@ varying_matches::~varying_matches() /** - * Packing is always safe on individual arrays, structure and matices. It is - * also safe if the varying is only used for transform feedback. + * Packing is always safe on individual arrays, structures, and matrices. It + * is also safe if the varying is only used for transform feedback. */ bool varying_matches::is_varying_packing_safe(const glsl_type *type, @@ -1980,10 +1980,10 @@ assign_varying_locations(struct gl_context *ctx, /* Disable varying packing for GL 4.4+ as there is no guarantee * that interpolation qualifiers will match between shaders in these - * versions. We also disable packing on outerward facing interfaces for + * versions. We also disable packing on outward facing interfaces for * SSO because in ES we need to retain the unpacked varying information * for draw time validation. For desktop GL we could allow packing for - * versions < 4.4 but its just safer not to do packing. + * versions < 4.4 but it's just safer not to do packing. * * Packing is still enabled on individual arrays, structs, and matrices as * these are required by the transform feedback code and it is still safe @@ -2080,7 +2080,7 @@ assign_varying_locations(struct gl_context *ctx, consumer_interface_inputs, consumer_inputs_with_locations); - /* If a matching input variable was found, add this ouptut (and the + /* If a matching input variable was found, add this output (and the * input) to the set. If this is a separable program and there is no * consumer stage, add the output. * diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp index 586e2b20d54..7f54433b307 100644 --- a/src/compiler/glsl/linker.cpp +++ b/src/compiler/glsl/linker.cpp @@ -4741,9 +4741,9 @@ link_shaders(struct gl_context *ctx, struct gl_shader_program *prog) /* If there is no fragment shader we need to set transform feedback. * - * For SSO we need also need to assign output locations, we assign them - * here because we need to do it for both single stage programs and multi - * stage programs. + * For SSO we also need to assign output locations. We assign them here + * because we need to do it for both single stage programs and multi stage + * programs. */ if (last < MESA_SHADER_FRAGMENT && (num_tfeedback_decls != 0 || prog->SeparateShader)) { |