projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'mesa_7_7_branch'
[mesa.git]
/
src
/
mesa
/
shader
/
nvfragparse.c
diff --git
a/src/mesa/shader/nvfragparse.c
b/src/mesa/shader/nvfragparse.c
index b739a6aa07c951e57bd9838159149beb07aa2597..8ee7c9306264b3b08ff241cc69086ba2f46a4c1a 100644
(file)
--- a/
src/mesa/shader/nvfragparse.c
+++ b/
src/mesa/shader/nvfragparse.c
@@
-642,7
+642,7
@@
Parse_SwizzleSuffix(const GLubyte *token, GLuint swizzle[4])
else {
/* 4-component swizzle (vector) */
GLint k;
- for (k = 0;
token[k] && k < 4
; k++) {
+ for (k = 0;
k < 4 && token[k]
; k++) {
if (token[k] == 'x')
swizzle[k] = 0;
else if (token[k] == 'y')