diff options
| author | marha <marha@users.sourceforge.net> | 2010-03-07 16:00:29 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-03-07 16:00:29 +0000 |
| commit | b40894093babb10f3cd155f11ff2d6c710372395 (patch) | |
| tree | e6e94e5aa39ca9d5a653af567145e4b5dda25d61 /mesalib/src/mesa/shader/nvfragparse.c | |
| parent | d27419efcdaaccb40e0f10c549a6b732a2f29e81 (diff) | |
| parent | 14b1cb8d5a27ec9716d3f790fce95f0469e35605 (diff) | |
| download | vcxsrv-b40894093babb10f3cd155f11ff2d6c710372395.tar.gz vcxsrv-b40894093babb10f3cd155f11ff2d6c710372395.tar.bz2 vcxsrv-b40894093babb10f3cd155f11ff2d6c710372395.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/shader/nvfragparse.c')
| -rw-r--r-- | mesalib/src/mesa/shader/nvfragparse.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mesalib/src/mesa/shader/nvfragparse.c b/mesalib/src/mesa/shader/nvfragparse.c index 0fd55524a..b739a6aa0 100644 --- a/mesalib/src/mesa/shader/nvfragparse.c +++ b/mesalib/src/mesa/shader/nvfragparse.c @@ -217,6 +217,12 @@ MatchInstruction(const GLubyte *token) const struct instruction_pattern *inst; struct instruction_pattern result; + result.name = NULL; + result.opcode = MAX_OPCODE; /* i.e. invalid instruction */ + result.inputs = 0; + result.outputs = 0; + result.suffixes = 0; + for (inst = Instructions; inst->name; inst++) { if (_mesa_strncmp((const char *) token, inst->name, 3) == 0) { /* matched! */ @@ -247,7 +253,7 @@ MatchInstruction(const GLubyte *token) return result; } } - result.opcode = MAX_OPCODE; /* i.e. invalid instruction */ + return result; } |