diff options
| author | Brian Paul <brianp@vmware.com> | 2009-09-09 08:33:39 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-09-09 08:33:39 -0600 |
| commit | 0c309bb494b6ee1c403442d1207743f749f95b6e (patch) | |
| tree | a3cb118c850ef4152312e81afdb7543f45ef2e3e /src/gallium/auxiliary/util | |
| parent | c6c44bf48124dd5b4661014a8d58482c5a54557f (diff) | |
| parent | d27d659043bd7f2bd9a2636209f299cda0664230 (diff) | |
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
Conflicts:
Makefile
configs/default
progs/glsl/Makefile
src/gallium/auxiliary/util/u_simple_shaders.c
src/gallium/state_trackers/glx/xlib/xm_api.c
src/mesa/drivers/dri/i965/brw_draw_upload.c
src/mesa/drivers/dri/i965/brw_vs_emit.c
src/mesa/drivers/dri/intel/intel_context.h
src/mesa/drivers/dri/intel/intel_pixel.c
src/mesa/drivers/dri/intel/intel_pixel_read.c
src/mesa/main/texenvprogram.c
src/mesa/main/version.h
Diffstat (limited to 'src/gallium/auxiliary/util')
| -rw-r--r-- | src/gallium/auxiliary/util/u_simple_shaders.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gallium/auxiliary/util/u_simple_shaders.c b/src/gallium/auxiliary/util/u_simple_shaders.c index 1b8da9b685..ab754296fa 100644 --- a/src/gallium/auxiliary/util/u_simple_shaders.c +++ b/src/gallium/auxiliary/util/u_simple_shaders.c @@ -131,8 +131,6 @@ util_make_fragment_tex_shader(struct pipe_context *pipe ) - - /** * Make simple fragment color pass-through shader. */ |