1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
|
Description: Some nasty typos fixed to silence lintian et al.
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Index: Mesa/src/mesa/main/debug.c
===================================================================
--- Mesa.orig/src/mesa/main/debug.c
+++ Mesa/src/mesa/main/debug.c
@@ -43,7 +43,7 @@ const char *_mesa_prim_name[GL_POLYGON+4
"GL_QUAD_STRIP",
"GL_POLYGON",
"outside begin/end",
- "inside unkown primitive",
+ "inside unknown primitive",
"unknown state"
};
Index: Mesa/src/mesa/shader/arbprogparse.c
===================================================================
--- Mesa.orig/src/mesa/shader/arbprogparse.c
+++ Mesa/src/mesa/shader/arbprogparse.c
@@ -97,8 +97,8 @@
*
* Cosmetic Stuff
* -----------------------------------------------------
- * - remove any leftover unused grammer.c stuff (dict_ ?)
- * - fix grammer.c error handling so its not static
+ * - remove any leftover unused grammar.c stuff (dict_ ?)
+ * - fix grammar.c error handling so its not static
* - #ifdef around stuff pertaining to extentions
*
* Outstanding Questions:
@@ -1703,7 +1703,7 @@ parse_attrib (GLcontext * ctx, GLubyte *
if (found) {
error_msg = (char *)
_mesa_malloc (_mesa_strlen ((char *) attrib_var->name) + 40);
- _mesa_sprintf (error_msg, "Duplicate Varible Declaration: %s",
+ _mesa_sprintf (error_msg, "Duplicate Variable Declaration: %s",
attrib_var->name);
_mesa_set_program_error (ctx, Program->Position, error_msg);
@@ -1904,7 +1904,7 @@ parse_param (GLcontext * ctx, GLubyte **
if (found) {
error_msg = (char *) _mesa_malloc (_mesa_strlen ((char *) param_var->name) + 40);
- _mesa_sprintf (error_msg, "Duplicate Varible Declaration: %s",
+ _mesa_sprintf (error_msg, "Duplicate Variable Declaration: %s",
param_var->name);
_mesa_set_program_error (ctx, Program->Position, error_msg);
@@ -2013,7 +2013,7 @@ parse_temp (GLcontext * ctx, GLubyte **
if (found) {
error_msg = (char *)
_mesa_malloc (_mesa_strlen ((char *) temp_var->name) + 40);
- _mesa_sprintf (error_msg, "Duplicate Varible Declaration: %s",
+ _mesa_sprintf (error_msg, "Duplicate Variable Declaration: %s",
temp_var->name);
_mesa_set_program_error (ctx, Program->Position, error_msg);
@@ -2064,7 +2064,7 @@ parse_output (GLcontext * ctx, GLubyte *
char *error_msg;
error_msg = (char *)
_mesa_malloc (_mesa_strlen ((char *) output_var->name) + 40);
- _mesa_sprintf (error_msg, "Duplicate Varible Declaration: %s",
+ _mesa_sprintf (error_msg, "Duplicate Variable Declaration: %s",
output_var->name);
_mesa_set_program_error (ctx, Program->Position, error_msg);
@@ -2099,7 +2099,7 @@ parse_alias (GLcontext * ctx, GLubyte **
if (found) {
error_msg = (char *)
_mesa_malloc (_mesa_strlen ((char *) temp_var->name) + 40);
- _mesa_sprintf (error_msg, "Duplicate Varible Declaration: %s",
+ _mesa_sprintf (error_msg, "Duplicate Variable Declaration: %s",
temp_var->name);
_mesa_set_program_error (ctx, Program->Position, error_msg);
@@ -2149,7 +2149,7 @@ parse_address (GLcontext * ctx, GLubyte
if (found) {
error_msg = (char *)
_mesa_malloc (_mesa_strlen ((char *) temp_var->name) + 40);
- _mesa_sprintf (error_msg, "Duplicate Varible Declaration: %s",
+ _mesa_sprintf (error_msg, "Duplicate Variable Declaration: %s",
temp_var->name);
_mesa_set_program_error (ctx, Program->Position, error_msg);
@@ -3980,7 +3980,7 @@ _mesa_parse_arb_program (GLcontext * ctx
grammar_get_last_error ((GLubyte *) error_msg, 300, &error_pos);
_mesa_set_program_error (ctx, error_pos, error_msg);
_mesa_error (ctx, GL_INVALID_OPERATION,
- "Error loading grammer rule set");
+ "Error loading grammar rule set");
return GL_FALSE;
}
@@ -4070,7 +4070,7 @@ _mesa_parse_arb_program (GLcontext * ctx
}
#if DEBUG_PARSING
- printf ("Destroying grammer dict [parse retval: %d]\n", err);
+ printf ("Destroying grammar dict [parse retval: %d]\n", err);
#endif
grammar_destroy (arbprogram_syn_id);
@@ -4103,11 +4103,11 @@ _mesa_parse_arb_program (GLcontext * ctx
/* Start examining the tokens in the array */
inst = parsed;
- /* Check the grammer rev */
+ /* Check the grammar rev */
if (*inst++ != REVISION) {
_mesa_set_program_error (ctx, 0, "Grammar version mismatch");
_mesa_error(ctx, GL_INVALID_OPERATION,
- "glProgramStringARB(Grammar verison mismatch)");
+ "glProgramStringARB(Grammar version mismatch)");
err = GL_TRUE;
}
else {
|
