mesa/glsl: rename preprocess to glcpp_preprocess
authorDave Airlie <airlied@redhat.com>
Fri, 14 Sep 2012 00:13:01 +0000 (10:13 +1000)
committerDave Airlie <airlied@gmail.com>
Fri, 14 Sep 2012 22:27:51 +0000 (08:27 +1000)
commit7cfd42cefe1949af51ecced9891f415eca2c0e66
tree2714b76151ebf917cda7b64350e21f982d7cedaa
parent8f7990c5f2ca25e42c7fefff6312bee2ff77e134
mesa/glsl: rename preprocess to glcpp_preprocess

This symbol with dricore escapes into the namespace, its too generic,
we should prefix it with something just to be nice.

Should be applied to stable + 9.0

Acked-by: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
(cherry picked from commit 88b0790b1ae8864d4ec6196b3939498bbffdbb5f)
src/glsl/glcpp/glcpp.c
src/glsl/glcpp/glcpp.h
src/glsl/glcpp/pp.c
src/glsl/glsl_parser_extras.h
src/glsl/main.cpp
src/glsl/test_optpass.cpp
src/mesa/program/ir_to_mesa.cpp