~pcsx2-team/pcsx2-github-mirror/+git/glslang:kokoro-testing

Last commit made on 2020-06-16
Get this branch:
git clone -b kokoro-testing https://git.launchpad.net/~pcsx2-team/pcsx2-github-mirror/+git/glslang

Branch merges

Branch information

Name:
kokoro-testing
Repository:
lp:~pcsx2-team/pcsx2-github-mirror/+git/glslang

Recent commits

051c6fe... by John Kessenich <email address hidden>

Build: use better MSVC subfolder names for the previous build changes.

b247cfc... by John Kessenich <email address hidden>

Merge pull request #2275 from ben-clayton/mv-hlsl

Move hlsl/ source to glslang/HLSL/

abd91ad... by John Kessenich <email address hidden>

Bump version numbers.

f49820d... by Ben Clayton <email address hidden>

Move hlsl/ source to glslang/HLSL/

Now that the HLSL source files are part of the `glslang` target (#2271), it makes sense for these to sit in the `glslang` directory.

Changed the case of the directory from `hlsl` to `HLSL` to better match the sibling directories.

4928d55... by John Kessenich <email address hidden>

Merge pull request #2271 from ben-clayton/fold-hlsl

Untangle build target cyclic dependencies (approach #2)

bd392c6... by John Kessenich <email address hidden>

Bump version.

dcad9ad... by Ben Clayton <email address hidden>

CMake: Fold HLSL source into glslang

... and stub the HLSL target.

Fixes the building of shared libraries.

This breaks the cyclic dependency between the `glslang` and `hlsl` targets (by essentially removing the `hlsl` target).

The `BUILD.gn` and `BUILD.bazel` build rules already pull the `HLSL` source into the `glslang` target.

`Android.mk` is the only remaining build config that has a dedicated `HLSL` target, but this is explicity static and does not suffer the same link-time issues with the cyclic dependency (we may wish to stub this target too).

Related issue: #1484, #2147
Related PR: #2267

00965b9... by dan sinclair

Remove unused variable. (#2273)

The `isMat` variable is no longer used in the HLSL parser. Removed.

8496b78... by Ryan Harrison <email address hidden>

Remove unused function, BaseTypeName (#2272)

a58978a... by John Kessenich <email address hidden>

HLSL: Remove support for having GLSL versions of HLSL intrinsics.

Related to PR #2265.