Externals / VideoCommon: update glslang to latest, turn into submodule #13940
+263
−140,476
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
To prepare for another change, I needed to update glslang. This updates us to the latest tag 15.4.0 and moves us to a submodule.
Previously, our build system for both CMake/Visual Studio would specify all the source files and effectively attempt to specify the right build files. This was cumbersome during an update, needing to determine which includes or source files were still around or which had been removed.
glslang also has another issue (which may be why we weren't using a submodule), this is that the project has a template file. Instead of attempting to create this file appropriately, we were just hardcoding the file.
Looking around, I noticed RPCS3 actually invokes the glslang's CMake build system inside the Visual Studio project. This allows us to completely remove the specific build files and fixes the template file issue.
The implementation (in Dolphin) is a bit klunky and there is currently some duplication in settings but the build seemed to work on my system. It does have an additional copy step to copy the
*.lib
files built by CMake to the output directory for use in the build. Also, I couldn't find a better way to include the necessary libraries, so like FFMPEG and some of our other dependencies, there are additional libs included in our base props.Finally, the glslang update had some other changes:
TIntermediate
class functions aren't public any more, instead they've moved to theTShader
DefaultTBuiltInResource
is being removed from the public interface in the next release, figured we should prepare for this.