st/glsl: merge st_glsl_to_ir.cpp with st_glsl_to_nir.cpp
authorTimothy Arceri <tarceri@itsqueeze.com>
Wed, 5 Jul 2023 02:48:34 +0000 (12:48 +1000)
committerMarge Bot <emma+marge@anholt.net>
Thu, 6 Jul 2023 01:21:07 +0000 (01:21 +0000)
commit5c1d91d5da45000a62b273ecfc8ac1c7f4bdc7ca
tree8f49817dca50aeec0a52f3ae3708a53abca098be
parentc6fe8b7cba031a0b694dc304e76b58b55ac72b8a
st/glsl: merge st_glsl_to_ir.cpp with st_glsl_to_nir.cpp

There is no longer any other IR so lets finally merge these together
to make the code easier to follow.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22846>
src/mesa/main/shaderapi.c
src/mesa/main/tests/disable_windows_include.c
src/mesa/meson.build
src/mesa/state_tracker/st_glsl_to_ir.cpp [deleted file]
src/mesa/state_tracker/st_glsl_to_nir.cpp
src/mesa/state_tracker/st_glsl_to_nir.h [moved from src/mesa/state_tracker/st_glsl_to_ir.h with 100% similarity]
src/mesa/state_tracker/st_nir.h