From 0360f81b9741ece65768a65731bd23455a3b7a96 Mon Sep 17 00:00:00 2001 From: Tim Foley Date: Fri, 2 Feb 2018 08:49:04 -0800 Subject: Remove support for the -no-checking flag (#392) * Remove support for the -no-checking flag Fixes #381 Fixes #383 Work on #382 - No longer expose flag through API (`SLANG_COMPILE_FLAG_NO_CHECKING`) and command-line (`-no-checking`) options - Remove all logic in `check.cpp` that was withholding diagnostics (including errors) when the no-checking mode was enabled - Remove `HiddenImplicitCastExpr`, which was only created to support no-checking mode (it represented an implicit cast that our checking through was needed, but couldn't emit because it might be wrong) - Remove logic for storing function bodies as raw token lists when checking is turned off. I'm leaving in the `UnparsedStmt` AST node in case we ever need/want to lazily parse and check function bodies down the line. - Remove a few of the code-generation paths we had to contend with, but keep the comment about them in place. - Remove GLSL-based tests that can't meaningfully work with the new approach. - Fix other tests that used a GLSL baseline so that their GLSL compiles with `-pass-through glslang` instead of invoking `slang` with the `-no-checking` flag. - Remove tests that were explicitly added to test the "rewriter + IR" path, since that is no longer supported. There is more cleanup that can be done here, now that we know that AST-based rewrite and IR will never co-exist, but it is probably easier to deal with that as part of removing the AST-based rewrite path. We've lost some test coverage here, but actually not too much if we consider that we are dropping GLSL input anyway. * Fixup: test runner was mis-counting ignored tests * Fixup: turn on dumping on test failure under Travis * Fixup: enable extensions in Linux build of glslang --- tests/reflection/sample-rate-input.glsl | 15 ------- tests/reflection/sample-rate-input.glsl.expected | 57 ------------------------ tests/reflection/thread-group-size.comp | 18 -------- tests/reflection/thread-group-size.comp.expected | 39 ---------------- 4 files changed, 129 deletions(-) delete mode 100644 tests/reflection/sample-rate-input.glsl delete mode 100644 tests/reflection/sample-rate-input.glsl.expected delete mode 100644 tests/reflection/thread-group-size.comp delete mode 100644 tests/reflection/thread-group-size.comp.expected (limited to 'tests/reflection') diff --git a/tests/reflection/sample-rate-input.glsl b/tests/reflection/sample-rate-input.glsl deleted file mode 100644 index b8151aee1..000000000 --- a/tests/reflection/sample-rate-input.glsl +++ /dev/null @@ -1,15 +0,0 @@ -//TEST(smoke):REFLECTION:-profile ps_4_0 -no-checking - -// Check that we report sample-rate entry point input correctly - -uniform texture2D t; -uniform sampler s; - -sample in vec2 uv; - -out vec4 c; - -void main() -{ - c = texture(sampler2D(t,s), uv); -} diff --git a/tests/reflection/sample-rate-input.glsl.expected b/tests/reflection/sample-rate-input.glsl.expected deleted file mode 100644 index 53e0b6e17..000000000 --- a/tests/reflection/sample-rate-input.glsl.expected +++ /dev/null @@ -1,57 +0,0 @@ -result code = 0 -standard error = { -} -standard output = { -{ - "parameters": [ - { - "name": "t", - "binding": {"kind": "descriptorTableSlot", "index": 0}, - "type": { - "kind": "resource", - "baseShape": "texture2D" - } - }, - { - "name": "s", - "binding": {"kind": "descriptorTableSlot", "index": 1}, - "type": { - "kind": "samplerState" - } - }, - { - "name": "uv", - "stage": "fragment", - "binding": {"kind": "varyingInput", "index": 0}, - "type": { - "kind": "vector", - "elementCount": 2, - "elementType": { - "kind": "scalar", - "scalarType": "float32" - } - } - }, - { - "name": "c", - "stage": "fragment", - "binding": {"kind": "varyingOutput", "index": 0}, - "type": { - "kind": "vector", - "elementCount": 4, - "elementType": { - "kind": "scalar", - "scalarType": "float32" - } - } - } - ], - "entryPoints": [ - { - "name": "main", - "stage:": "fragment", - "usesAnySampleRateInput": true - } - ] -} -} diff --git a/tests/reflection/thread-group-size.comp b/tests/reflection/thread-group-size.comp deleted file mode 100644 index ff29490a5..000000000 --- a/tests/reflection/thread-group-size.comp +++ /dev/null @@ -1,18 +0,0 @@ -//TEST:REFLECTION:-no-checking -target glsl - -// Confirm that we provide reflection data for the `local_size_*` attributes - -layout(local_size_x = 3) in; - -layout(local_size_y = 5, local_size_z = 7) in; - -buffer B -{ - float b[]; -}; - -void main() -{ - uint tid = gl_GlobalInvocationID.x; - b[tid] = b[tid + 1] + 1.0f; -} \ No newline at end of file diff --git a/tests/reflection/thread-group-size.comp.expected b/tests/reflection/thread-group-size.comp.expected deleted file mode 100644 index facd52cc0..000000000 --- a/tests/reflection/thread-group-size.comp.expected +++ /dev/null @@ -1,39 +0,0 @@ -result code = 0 -standard error = { -} -standard output = { -{ - "parameters": [ - { - "name": "B", - "binding": {"kind": "descriptorTableSlot", "index": 0}, - "type": { - "kind": "shaderStorageBuffer", - "elementType": { - "kind": "struct", - "fields": [ - { - "name": "b", - "type": { - "kind": "array", - "elementCount": 0, - "elementType": { - "kind": "scalar", - "scalarType": "float32" - } - } - } - ] - } - } - } - ], - "entryPoints": [ - { - "name": "main", - "stage:": "compute", - "threadGroupSize": [3, 5, 7] - } - ] -} -} -- cgit v1.2.3