glsl: add extra pp tokens workaround and enable for CoR

Graphics / Mesa 3D Graphics Library / Mesa - Timothy Arceri [itsqueeze.com] - 29 October 2020 23:35 UTC

The CTS now tests to make sure these are not allowed. However, previously drivers (including Mesa) would allow them to exist and just issue a warning. Some old applications such as Champions of Regnum seem to depend on this.

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/422

Fixes: 43047384c331 ("glsl/glcpp: Promote "extra token at end of directive" from warning to error")

a09717c4de0 glsl: add extra pp tokens workaround and enable for CoR
src/compiler/glsl/glcpp/glcpp-parse.y | 5 ++++-
src/gallium/auxiliary/pipe-loader/driinfo_gallium.h | 1 +
src/gallium/frontends/dri/dri_screen.c | 2 ++
src/gallium/include/frontend/api.h | 1 +
src/mesa/drivers/dri/i965/intel_screen.c | 1 +
src/mesa/main/mtypes.h | 8 ++++++++
src/mesa/state_tracker/st_extensions.c | 2 ++
src/util/00-mesa-defaults.conf | 4 ++++
src/util/driconf.h | 4 ++++
9 files changed, 27 insertions(+), 1 deletion(-)

Upstream: cgit.freedesktop.org


  • Share