summaryrefslogtreecommitdiff
path: root/glamor
diff options
context:
space:
mode:
authorEric Engestrom <eric@engestrom.ch>2016-04-02 19:53:18 +0100
committerEric Anholt <eric@anholt.net>2016-09-25 10:40:08 -0700
commit128d40b2dd0a26a075a67854455d4208afaa01ca (patch)
treede9ee341b9f64c388848399c43aceed053c8bc35 /glamor
parentade315386cee9a65a3885c65e96256880ac6f00a (diff)
glamor: fix spelling mistakes
v2: Fix "orignal" too (review feedback by ajax, change by anholt)_ Signed-off-by: Eric Engestrom <eric@engestrom.ch> Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'glamor')
-rw-r--r--glamor/glamor_gradient.c8
-rw-r--r--glamor/glamor_largepixmap.c2
-rw-r--r--glamor/glamor_render.c2
3 files changed, 6 insertions, 6 deletions
diff --git a/glamor/glamor_gradient.c b/glamor/glamor_gradient.c
index c50542a32..0c97ce7cb 100644
--- a/glamor/glamor_gradient.c
+++ b/glamor/glamor_gradient.c
@@ -603,7 +603,7 @@ _glamor_gradient_convert_trans_matrix(PictTransform *from, float to[3][3],
* So, to get the correct v_s, we need to cacula1 the matrix: (A*T*inv(A)), and
* we name this matrix T_s.
*
- * Firstly, because A is for the scale convertion, we find
+ * Firstly, because A is for the scale conversion, we find
* -- --
* |1/w 0 0 |
* A = | 0 1/h 0 |
@@ -884,7 +884,7 @@ glamor_generate_radial_gradient_picture(ScreenPtr screen,
stops_count = src_picture->pSourcePict->radial.nstops + 2;
- /* Because the max value of nstops is unkown, so create a program
+ /* Because the max value of nstops is unknown, so create a program
when nstops > LINEAR_LARGE_STOPS. */
if (stops_count <= RADIAL_SMALL_STOPS) {
gradient_prog = glamor_priv->gradient_prog[SHADER_GRADIENT_RADIAL][0];
@@ -1193,7 +1193,7 @@ glamor_generate_linear_gradient_picture(ScreenPtr screen,
stops_count = src_picture->pSourcePict->linear.nstops + 2;
- /* Because the max value of nstops is unkown, so create a program
+ /* Because the max value of nstops is unknown, so create a program
when nstops > LINEAR_LARGE_STOPS. */
if (stops_count <= LINEAR_SMALL_STOPS) {
gradient_prog = glamor_priv->gradient_prog[SHADER_GRADIENT_LINEAR][0];
@@ -1403,7 +1403,7 @@ glamor_generate_linear_gradient_picture(ScreenPtr screen,
}
else {
/* The slope need to compute here. In shader, the viewport set will change
- the orginal slope and the slope which is vertical to it will not be correct. */
+ the original slope and the slope which is vertical to it will not be correct. */
slope = -(float) (src_picture->pSourcePict->linear.p2.x
- src_picture->pSourcePict->linear.p1.x) /
(float) (src_picture->pSourcePict->linear.p2.y
diff --git a/glamor/glamor_largepixmap.c b/glamor/glamor_largepixmap.c
index 9a6c95ee9..ebfdc9537 100644
--- a/glamor/glamor_largepixmap.c
+++ b/glamor/glamor_largepixmap.c
@@ -1259,7 +1259,7 @@ glamor_composite_largepixmap_region(CARD8 op,
is_normal_mask_fbo = 1;
}
else {
- /* This mask region has transform or repeatpad, we need clip it agains the previous
+ /* This mask region has transform or repeatpad, we need clip it against the previous
* valid region rather than the mask region. */
if (!is_normal_source_fbo)
clipped_mask_regions =
diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c
index 64141ac0f..f87bbf34f 100644
--- a/glamor/glamor_render.c
+++ b/glamor/glamor_render.c
@@ -1481,7 +1481,7 @@ glamor_composite_clipped_region(CARD8 op,
&& (mask_pixmap->drawable.width != width
|| mask_pixmap->drawable.height != height)))) {
/* XXX if mask->pDrawable is the same as source->pDrawable, we have an opportunity
- * to do reduce one convertion. */
+ * to do reduce one conversion. */
temp_mask =
glamor_convert_gradient_picture(screen, mask,
extent->x1 + x_mask - x_dest - dest->pDrawable->x,