encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-12-11 14:41:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

tint: Deprecated module-scope 'let' for 'const'

Browse Source 
Enable the parsing of 'const'.
Warn on use of module-scope 'let', and automatically replace with 'const'.

Fixed: tint:1580
Change-Id: I214aabca80686dc6b60ae21a7a57fbfb4898ea83
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/93786
Commit-Queue: Ben Clayton <bclayton@google.com>
Reviewed-by: Dan Sinclair <dsinclair@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
This commit is contained in:
Ben Clayton
2022-06-29 00:55:36 +00:00
committed by Dawn LUCI CQ
parent 03f88e6f49
commit c64ca23d94
224 changed files with 1443 additions and 2495 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
test/tint/let/global/global.wgsl
View File

@@ -1,24 +0,0 @@
struct MyStruct {
f1 : f32,
};
type MyArray = array<f32, 10>;
// Global lets
let v1 = 1;
let v2 = 1u;
let v3 = 1.0;
let v4 = vec3<i32>(1, 1, 1);
let v5 = vec3<u32>(1u, 1u, 1u);
let v6 = vec3<f32>(1.0, 1.0, 1.0);
let v7 = mat3x3<f32>(vec3<f32>(1.0, 1.0, 1.0), vec3<f32>(1.0, 1.0, 1.0), vec3<f32>(1.0, 1.0, 1.0));
let v8 = MyStruct();
let v9 = MyArray();
@fragment
fn main() -> @location(0) vec4<f32> {
return vec4<f32>(0.0,0.0,0.0,0.0);
}

17
test/tint/let/global/global.wgsl.expected.glsl
View File

@@ -1,17 +0,0 @@
#version 310 es
precision mediump float;
layout(location = 0) out vec4 value;
struct MyStruct {
float f1;
};
vec4 tint_symbol() {
return vec4(0.0f);
}
void main() {
vec4 inner_result = tint_symbol();
value = inner_result;
return;
}

28
test/tint/let/global/global.wgsl.expected.hlsl
View File

@@ -1,28 +0,0 @@
struct MyStruct {
float f1;
};
static const int v1 = 1;
static const uint v2 = 1u;
static const float v3 = 1.0f;
static const int3 v4 = (1).xxx;
static const uint3 v5 = (1u).xxx;
static const float3 v6 = (1.0f).xxx;
static const float3x3 v7 = float3x3((1.0f).xxx, (1.0f).xxx, (1.0f).xxx);
static const MyStruct v8 = (MyStruct)0;
static const float v9[10] = (float[10])0;
struct tint_symbol {
float4 value : SV_Target0;
};
float4 main_inner() {
return (0.0f).xxxx;
}
tint_symbol main() {
const float4 inner_result = main_inner();
tint_symbol wrapper_result = (tint_symbol)0;
wrapper_result.value = inner_result;
return wrapper_result;
}

53
test/tint/let/global/global.wgsl.expected.msl
View File

@@ -1,53 +0,0 @@
#include <metal_stdlib>
using namespace metal;
template<typename T, size_t N>
struct tint_array {
const constant T& operator[](size_t i) const constant { return elements[i]; }
device T& operator[](size_t i) device { return elements[i]; }
const device T& operator[](size_t i) const device { return elements[i]; }
thread T& operator[](size_t i) thread { return elements[i]; }
const thread T& operator[](size_t i) const thread { return elements[i]; }
threadgroup T& operator[](size_t i) threadgroup { return elements[i]; }
const threadgroup T& operator[](size_t i) const threadgroup { return elements[i]; }
T elements[N];
};
struct MyStruct {
float f1;
};
constant int v1 = 1;
constant uint v2 = 1u;
constant float v3 = 1.0f;
constant int3 v4 = int3(1);
constant uint3 v5 = uint3(1u);
constant float3 v6 = float3(1.0f);
constant float3x3 v7 = float3x3(float3(1.0f), float3(1.0f), float3(1.0f));
constant MyStruct v8 = {};
constant tint_array<float, 10> v9 = tint_array<float, 10>{};
struct tint_symbol_1 {
float4 value [[color(0)]];
};
float4 tint_symbol_inner() {
return float4(0.0f);
}
fragment tint_symbol_1 tint_symbol() {
float4 const inner_result = tint_symbol_inner();
tint_symbol_1 wrapper_result = {};
wrapper_result.value = inner_result;
return wrapper_result;
}

62
test/tint/let/global/global.wgsl.expected.spvasm
View File

@@ -1,62 +0,0 @@
; SPIR-V
; Version: 1.3
; Generator: Google Tint Compiler; 0
; Bound: 32
; Schema: 0
OpCapability Shader
OpMemoryModel Logical GLSL450
OpEntryPoint Fragment %main "main" %value
OpExecutionMode %main OriginUpperLeft
OpName %value "value"
OpName %v1 "v1"
OpName %v2 "v2"
OpName %v3 "v3"
OpName %v4 "v4"
OpName %v5 "v5"
OpName %v6 "v6"
OpName %v7 "v7"
OpName %MyStruct "MyStruct"
OpMemberName %MyStruct 0 "f1"
OpName %v8 "v8"
OpName %v9 "v9"
OpName %main_inner "main_inner"
OpName %main "main"
OpDecorate %value Location 0
OpMemberDecorate %MyStruct 0 Offset 0
OpDecorate %_arr_float_uint_10 ArrayStride 4
%float = OpTypeFloat 32
%v4float = OpTypeVector %float 4
%_ptr_Output_v4float = OpTypePointer Output %v4float
%5 = OpConstantNull %v4float
%value = OpVariable %_ptr_Output_v4float Output %5
%int = OpTypeInt 32 1
%v1 = OpConstant %int 1
%uint = OpTypeInt 32 0
%v2 = OpConstant %uint 1
%v3 = OpConstant %float 1
%v3int = OpTypeVector %int 3
%v4 = OpConstantComposite %v3int %v1 %v1 %v1
%v3uint = OpTypeVector %uint 3
%v5 = OpConstantComposite %v3uint %v2 %v2 %v2
%v3float = OpTypeVector %float 3
%v6 = OpConstantComposite %v3float %v3 %v3 %v3
%mat3v3float = OpTypeMatrix %v3float 3
%v7 = OpConstantComposite %mat3v3float %v6 %v6 %v6
%MyStruct = OpTypeStruct %float
%v8 = OpConstantNull %MyStruct
%uint_10 = OpConstant %uint 10
%_arr_float_uint_10 = OpTypeArray %float %uint_10
%v9 = OpConstantNull %_arr_float_uint_10
%24 = OpTypeFunction %v4float
%void = OpTypeVoid
%27 = OpTypeFunction %void
%main_inner = OpFunction %v4float None %24
%26 = OpLabel
OpReturnValue %5
OpFunctionEnd
%main = OpFunction %void None %27
%30 = OpLabel
%31 = OpFunctionCall %v4float %main_inner
OpStore %value %31
OpReturn
OpFunctionEnd

28
test/tint/let/global/global.wgsl.expected.wgsl
View File

@@ -1,28 +0,0 @@
struct MyStruct {
f1 : f32,
}
type MyArray = array<f32, 10>;
let v1 = 1;
let v2 = 1u;
let v3 = 1.0;
let v4 = vec3<i32>(1, 1, 1);
let v5 = vec3<u32>(1u, 1u, 1u);
let v6 = vec3<f32>(1.0, 1.0, 1.0);
let v7 = mat3x3<f32>(vec3<f32>(1.0, 1.0, 1.0), vec3<f32>(1.0, 1.0, 1.0), vec3<f32>(1.0, 1.0, 1.0));
let v8 = MyStruct();
let v9 = MyArray();
@fragment
fn main() -> @location(0) vec4<f32> {
return vec4<f32>(0.0, 0.0, 0.0, 0.0);
}

2
test/tint/let/inferred/function.wgsl.expected.hlsl
View File

@@ -32,7 +32,7 @@ void let_decls() {
const int3 v4 = (1).xxx;
const uint3 v5 = (1u).xxx;
const float3 v6 = (1.0f).xxx;
const float3x3 v7 = float3x3((1.0f).xxx, (1.0f).xxx, (1.0f).xxx);
const float3x3 v7 = float3x3(v6, v6, v6);
const MyStruct v8 = {1.0f};
const float v9[10] = (float[10])0;
const int v10 = ret_i32();

2
test/tint/let/inferred/function.wgsl.expected.msl
View File

@@ -47,7 +47,7 @@ void let_decls() {
int3 const v4 = int3(1);
uint3 const v5 = uint3(1u);
float3 const v6 = float3(1.0f);
float3x3 const v7 = float3x3(float3(1.0f), float3(1.0f), float3(1.0f));
float3x3 const v7 = float3x3(v6, v6, v6);
MyStruct const v8 = {.f1=1.0f};
tint_array<float, 10> const v9 = tint_array<float, 10>{};
int const v10 = ret_i32();

2
test/tint/let/inferred/function.wgsl.expected.spvasm
View File

@@ -50,7 +50,6 @@
%v3float = OpTypeVector %float 3
%40 = OpConstantComposite %v3float %float_1 %float_1 %float_1
%mat3v3float = OpTypeMatrix %v3float 3
%42 = OpConstantComposite %mat3v3float %40 %40 %40
%43 = OpConstantComposite %MyStruct %float_1
%50 = OpTypeFunction %v4float
%ret_i32 = OpFunction %int None %6
@@ -75,6 +74,7 @@
OpFunctionEnd
%let_decls = OpFunction %void None %31
%34 = OpLabel
%42 = OpCompositeConstruct %mat3v3float %40 %40 %40
%44 = OpFunctionCall %int %ret_i32
%45 = OpFunctionCall %uint %ret_u32
%46 = OpFunctionCall %float %ret_f32