diff options
| author | Alan Hourihane <[email protected]> | 2008-12-08 14:29:50 +0000 |
|---|---|---|
| committer | Alan Hourihane <[email protected]> | 2008-12-08 14:29:50 +0000 |
| commit | 33a1f495d4bb19288680b9812c6ec1235302d215 (patch) | |
| tree | d47067fe24d530c660b75ee80cdcec72f10d9ed0 /src/mesa/shader/prog_statevars.c | |
| parent | bcd5dda4358a5e47551278477bd00d2c63415c44 (diff) | |
| parent | bdc8ac4426f00eaafbe8ca0d356563efe390294d (diff) | |
Merge commit 'origin/master' into gallium-0.2
Conflicts:
progs/glsl/Makefile
Diffstat (limited to 'src/mesa/shader/prog_statevars.c')
| -rw-r--r-- | src/mesa/shader/prog_statevars.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/shader/prog_statevars.c b/src/mesa/shader/prog_statevars.c index 88fca198351..8d29acac8ba 100644 --- a/src/mesa/shader/prog_statevars.c +++ b/src/mesa/shader/prog_statevars.c @@ -632,7 +632,7 @@ append(char *dst, const char *src) /** - * Convert token 'k' to a string, append it only 'dst' string. + * Convert token 'k' to a string, append it onto 'dst' string. */ static void append_token(char *dst, gl_state_index k) @@ -807,7 +807,8 @@ append_token(char *dst, gl_state_index k) append(dst, "ShadowAmbient"); break; default: - ; + /* probably STATE_INTERNAL_DRIVER+i (driver private state) */ + append(dst, "driverState"); } } |