diff options
| author | José Fonseca <jfonseca@vmware.com> | 2010-01-31 05:36:33 +0000 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2010-01-31 05:36:33 +0000 |
| commit | bee9964b29b2428ee75e2d1efc0e1d2c2518a417 (patch) | |
| tree | fd733f886743b31f2ac2727e57f05d1a0918a977 /src/glsl | |
| parent | 36a0819ff4ede1af91dcf909106cf20659856384 (diff) | |
| parent | 12eb32e34244db9923cacaaed9ba951b7ac274a4 (diff) | |
Merge remote branch 'origin/master' into lp-binning
Conflicts:
Makefile
src/gallium/auxiliary/util/u_surface.c
src/gallium/drivers/llvmpipe/lp_flush.c
src/gallium/drivers/llvmpipe/lp_setup.c
src/gallium/drivers/llvmpipe/lp_state_derived.c
src/gallium/drivers/llvmpipe/lp_state_fs.c
src/gallium/drivers/llvmpipe/lp_state_surface.c
src/gallium/drivers/llvmpipe/lp_tex_cache.c
src/gallium/drivers/llvmpipe/lp_texture.c
src/gallium/drivers/llvmpipe/lp_tile_cache.c
src/mesa/state_tracker/st_cb_condrender.c
Diffstat (limited to 'src/glsl')
| -rw-r--r-- | src/glsl/cl/sl_cl_parse.c | 2 | ||||
| -rw-r--r-- | src/glsl/pp/sl_pp_purify.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/glsl/cl/sl_cl_parse.c b/src/glsl/cl/sl_cl_parse.c index e9b3707ac1..e256ab8213 100644 --- a/src/glsl/cl/sl_cl_parse.c +++ b/src/glsl/cl/sl_cl_parse.c @@ -345,7 +345,7 @@ struct parse_state { }; -static __inline unsigned int +static unsigned int _emit(struct parse_context *ctx, unsigned int *out, unsigned char b) diff --git a/src/glsl/pp/sl_pp_purify.c b/src/glsl/pp/sl_pp_purify.c index b50f819251..acc000cf3d 100644 --- a/src/glsl/pp/sl_pp_purify.c +++ b/src/glsl/pp/sl_pp_purify.c @@ -140,7 +140,7 @@ sl_pp_purify_state_init(struct sl_pp_purify_state *state, } -unsigned int +static unsigned int _purify_comment(struct sl_pp_purify_state *state, char *output, unsigned int *current_line, |