From: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue, 17 May 2016 22:01:19 +0000 (-0700)
Subject: glsl/linker: Fix trivial typos in comments
X-Git-Tag: upstream/17.1.0~9744
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cf9220b11f599ca77134528f5b4ad505f1345e1c;p=platform%2Fupstream%2Fmesa.git

glsl/linker: Fix trivial typos in comments

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Timothy Arceri <timothy.arceri@collabora.com>
---

diff --git a/src/compiler/glsl/link_varyings.cpp b/src/compiler/glsl/link_varyings.cpp
index 69b82d5..59ce1a2 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 586e2b2..7f54433 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)) {