From 4c78efd0c34442866f20e9d00bbb6908115c9a01 Mon Sep 17 00:00:00 2001 From: Yong He Date: Thu, 16 Nov 2023 14:32:33 -0800 Subject: Unify stdlib `Texture` types into one generic type. (#3327) * Unify Texture types in stdlib into 1 generic type. * Fixes. * Fix. * Fixes. * Fix reflection. * Fix binding reflection. * Add gather intrinsics. * Fix gather intrinsics. * Fix texture type toText. * Fix intrinsic. * fix cuda intrinsic. * Fix project files. * cleanup. * Fix. * Fix. * Fix sampler feedback test. * Fix getDimension intrinsics. * Fix spirv sample image intrinsics. * Fix test. * Fix GLSL intrinsic. * Cleanup. --------- Co-authored-by: Yong He --- tests/glsl/basic-fragment-2.slang | 2 +- tests/glsl/flat-in.slang | 1 + tests/glsl/matrix-mul.slang | 1 + tests/glsl/out-builtin-block-redeclaration.slang | 1 + tests/glsl/struct-construct.slang | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) (limited to 'tests/glsl') diff --git a/tests/glsl/basic-fragment-2.slang b/tests/glsl/basic-fragment-2.slang index c958b54b0..34a364152 100644 --- a/tests/glsl/basic-fragment-2.slang +++ b/tests/glsl/basic-fragment-2.slang @@ -1,5 +1,5 @@ //TEST:SIMPLE(filecheck=CHECK): -target spirv -stage fragment -entry main -allow-glsl - +//TEST:SIMPLE(filecheck=CHECK): -target spirv -stage fragment -entry main -allow-glsl -emit-spirv-directly #version 450 core layout(location = 0) out mediump vec4 o_color; layout(location = 0) in highp vec2 v_texCoord; diff --git a/tests/glsl/flat-in.slang b/tests/glsl/flat-in.slang index 4ca68df37..3de50d7ee 100644 --- a/tests/glsl/flat-in.slang +++ b/tests/glsl/flat-in.slang @@ -1,3 +1,4 @@ +//TEST:SIMPLE(filecheck=CHECK): -target spirv -stage fragment -entry main -allow-glsl -emit-spirv-directly //TEST:SIMPLE(filecheck=CHECK): -target spirv -stage fragment -entry main -allow-glsl #version 310 es diff --git a/tests/glsl/matrix-mul.slang b/tests/glsl/matrix-mul.slang index 6ac6613f2..c87c8ad18 100644 --- a/tests/glsl/matrix-mul.slang +++ b/tests/glsl/matrix-mul.slang @@ -1,3 +1,4 @@ +//TEST:SIMPLE(filecheck=CHECK): -target spirv -stage vertex -entry main -allow-glsl -emit-spirv-directly //TEST:SIMPLE(filecheck=CHECK): -target spirv -stage vertex -entry main -allow-glsl #version 310 es layout(location = 0) in highp vec4 a_position; diff --git a/tests/glsl/out-builtin-block-redeclaration.slang b/tests/glsl/out-builtin-block-redeclaration.slang index 7a2bfc1c9..9e50c5c37 100644 --- a/tests/glsl/out-builtin-block-redeclaration.slang +++ b/tests/glsl/out-builtin-block-redeclaration.slang @@ -1,3 +1,4 @@ +//TEST:SIMPLE(filecheck=CHECK): -target spirv -stage vertex -entry main -allow-glsl -emit-spirv-directly //TEST:SIMPLE(filecheck=CHECK): -target spirv -stage vertex -entry main -allow-glsl #version 450 core diff --git a/tests/glsl/struct-construct.slang b/tests/glsl/struct-construct.slang index a1538ed9b..747c9973c 100644 --- a/tests/glsl/struct-construct.slang +++ b/tests/glsl/struct-construct.slang @@ -1,3 +1,4 @@ +//TEST:SIMPLE(filecheck=CHECK): -target spirv -stage vertex -entry main -allow-glsl -emit-spirv-directly //TEST:SIMPLE(filecheck=CHECK): -target spirv -stage vertex -entry main -allow-glsl #version 310 es -- cgit v1.2.3