diff options
| author | Tim Foley <tfoleyNV@users.noreply.github.com> | 2018-02-03 07:30:54 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-03 07:30:54 -0800 |
| commit | 662f43fff6721c6cd013a8f1b2639c2e29fe6be3 (patch) | |
| tree | 9e57c4a9f1a922418fbae2390ee1998984a6ea26 /tests/rewriter | |
| parent | 58475a8aa42284722a3763aa3bde49f2fa40366e (diff) | |
Remove non-IR codegen paths (#398)
The basic change is simple: remove support for all code generation paths other than the IR.
There is a lot of vestigial code left, but the main logic in `ast-legalize.*` is gone.
Doing this breaks a *lot* of tests, for various reasons:
- We can no longer guarantee exactly matching DXBC or SPIR-V output after things pass through out IR
- Many builtins don't have matching versions defined for GLSL output via IR (even when they had versions defined via the earlier approach that worked with the AST)
- A lot of code creates intermediate values of opaque types in the IR, which turn into opaque-type temporaries that aren't allowed (this breaks many GLSL tests, but also some HLSL)
I implemented some small fixes for issues that I could get working in the time I had, but most of the above are larger than made sense to fix in this commit.
For now I'm disabling the tests that cause problems, but we will need to make a concerted effort to get things working on this new substrate if we are going to make good on our goals.
Diffstat (limited to 'tests/rewriter')
| -rw-r--r-- | tests/rewriter/glslang-bug-988-workaround.frag | 2 | ||||
| -rw-r--r-- | tests/rewriter/resources-in-structs.glsl | 2 | ||||
| -rw-r--r-- | tests/rewriter/varying-struct.vert | 9 |
3 files changed, 5 insertions, 8 deletions
diff --git a/tests/rewriter/glslang-bug-988-workaround.frag b/tests/rewriter/glslang-bug-988-workaround.frag index 578b49236..4e4046cfd 100644 --- a/tests/rewriter/glslang-bug-988-workaround.frag +++ b/tests/rewriter/glslang-bug-988-workaround.frag @@ -1,5 +1,5 @@ #version 450 -//TEST:COMPARE_GLSL: +//TEST_DISABLED:COMPARE_GLSL: // Test workaround for glslang issue #988 // (https://github.com/KhronosGroup/glslang/issues/988) diff --git a/tests/rewriter/resources-in-structs.glsl b/tests/rewriter/resources-in-structs.glsl index 8df64f244..f45c5b19f 100644 --- a/tests/rewriter/resources-in-structs.glsl +++ b/tests/rewriter/resources-in-structs.glsl @@ -1,5 +1,5 @@ #version 450 core -//TEST:COMPARE_GLSL:-profile glsl_fragment +//TEST_DISABLED:COMPARE_GLSL:-profile glsl_fragment #if defined(__SLANG__) diff --git a/tests/rewriter/varying-struct.vert b/tests/rewriter/varying-struct.vert index 74ca8be37..042125b15 100644 --- a/tests/rewriter/varying-struct.vert +++ b/tests/rewriter/varying-struct.vert @@ -1,16 +1,13 @@ #version 450 core -//TEST:COMPARE_GLSL: +//TEST_DISABLED:COMPARE_GLSL:-no-mangle #if defined(__SLANG__) __import varying_struct; -in VS_IN foo; -out VS_OUT bar; - -void main() +VS_OUT main(VS_IN foo) { - bar = doIt(foo); + return doIt(foo); } #else |
