encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-12-10 05:57:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reland "Remove deprecated textureLoad overloads with no level param"

Browse Source 
This is a reland of cc4c22ebaa

Original change's description:
> Remove deprecated textureLoad overloads with no level param
>
> BUG=tint:516
>
> Change-Id: I7004e0dbd44d703c684118136b05b84cf609c6ba
> Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/42703
> Reviewed-by: Ben Clayton <bclayton@google.com>
> Commit-Queue: Ryan Harrison <rharrison@chromium.org>

Bug: tint:516
Change-Id: Ic52893c78046cd54575cea51c244f6df5a4f843c
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/43620
Auto-Submit: Ryan Harrison <rharrison@chromium.org>
Commit-Queue: Ben Clayton <bclayton@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
This commit is contained in:
Ryan Harrison
2021-03-02 20:31:58 +00:00
committed by Commit Bot service account
parent e879143801
commit 2f8df72930
8 changed files with 18 additions and 636 deletions
Download Patch File Download Diff File Expand all files Collapse all files

190
src/ast/intrinsic_texture_helper_test.cc
View File

@@ -1661,45 +1661,6 @@ std::vector<TextureOverloadCase> TextureOverloadCase::ValidCases() {
5.f); // depth_ref
},
},
{
ValidTextureOverload::kLoad1dF32,
"textureLoad(t : texture_1d<f32>,\n"
" coords : i32) -> vec4<f32>",
TextureKind::kRegular,
type::TextureDimension::k1d,
TextureDataType::kF32,
"textureLoad",
[](ProgramBuilder* b) {
return b->ExprList("texture", // t
1); // coords
},
},
{
ValidTextureOverload::kLoad1dU32,
"textureLoad(t : texture_1d<u32>,\n"
" coords : i32) -> vec4<u32>",
TextureKind::kRegular,
type::TextureDimension::k1d,
TextureDataType::kU32,
"textureLoad",
[](ProgramBuilder* b) {
return b->ExprList("texture", // t
1); // coords
},
},
{
ValidTextureOverload::kLoad1dI32,
"textureLoad(t : texture_1d<i32>,\n"
" coords : i32) -> vec4<i32>",
TextureKind::kRegular,
type::TextureDimension::k1d,
TextureDataType::kI32,
"textureLoad",
[](ProgramBuilder* b) {
return b->ExprList("texture", // t
1); // coords
},
},
{
ValidTextureOverload::kLoad1dLevelF32,
"textureLoad(t : texture_1d<f32>,\n"
@@ -1745,45 +1706,6 @@ std::vector<TextureOverloadCase> TextureOverloadCase::ValidCases() {
3); // level
},
},
{
ValidTextureOverload::kLoad2dF32,
"textureLoad(t : texture_2d<f32>,\n"
" coords : vec2<i32>) -> vec4<f32>",
TextureKind::kRegular,
type::TextureDimension::k2d,
TextureDataType::kF32,
"textureLoad",
[](ProgramBuilder* b) {
return b->ExprList("texture", // t
b->vec2<i32>(1, 2)); // coords
},
},
{
ValidTextureOverload::kLoad2dU32,
"textureLoad(t : texture_2d<u32>,\n"
" coords : vec2<i32>) -> vec4<u32>",
TextureKind::kRegular,
type::TextureDimension::k2d,
TextureDataType::kU32,
"textureLoad",
[](ProgramBuilder* b) {
return b->ExprList("texture", // t
b->vec2<i32>(1, 2)); // coords
},
},
{
ValidTextureOverload::kLoad2dI32,
"textureLoad(t : texture_2d<i32>,\n"
" coords : vec2<i32>) -> vec4<i32>",
TextureKind::kRegular,
type::TextureDimension::k2d,
TextureDataType::kI32,
"textureLoad",
[](ProgramBuilder* b) {
return b->ExprList("texture", // t
b->vec2<i32>(1, 2)); // coords
},
},
{
ValidTextureOverload::kLoad2dLevelF32,
"textureLoad(t : texture_2d<f32>,\n"
@@ -1829,51 +1751,6 @@ std::vector<TextureOverloadCase> TextureOverloadCase::ValidCases() {
3); // level
},
},
{
ValidTextureOverload::kLoad2dArrayF32,
"textureLoad(t : texture_2d_array<f32>,\n"
" coords : vec2<i32>,\n"
" array_index : i32) -> vec4<f32>",
TextureKind::kRegular,
type::TextureDimension::k2dArray,
TextureDataType::kF32,
"textureLoad",
[](ProgramBuilder* b) {
return b->ExprList("texture", // t
b->vec2<i32>(1, 2), // coords
3); // array_index
},
},
{
ValidTextureOverload::kLoad2dArrayU32,
"textureLoad(t : texture_2d_array<u32>,\n"
" coords : vec2<i32>,\n"
" array_index : i32) -> vec4<u32>",
TextureKind::kRegular,
type::TextureDimension::k2dArray,
TextureDataType::kU32,
"textureLoad",
[](ProgramBuilder* b) {
return b->ExprList("texture", // t
b->vec2<i32>(1, 2), // coords
3); // array_index
},
},
{
ValidTextureOverload::kLoad2dArrayI32,
"textureLoad(t : texture_2d_array<i32>,\n"
" coords : vec2<i32>,\n"
" array_index : i32) -> vec4<i32>",
TextureKind::kRegular,
type::TextureDimension::k2dArray,
TextureDataType::kI32,
"textureLoad",
[](ProgramBuilder* b) {
return b->ExprList("texture", // t
b->vec2<i32>(1, 2), // coords
3); // array_index
},
},
{
ValidTextureOverload::kLoad2dArrayLevelF32,
"textureLoad(t : texture_2d_array<f32>,\n"
@@ -1925,45 +1802,6 @@ std::vector<TextureOverloadCase> TextureOverloadCase::ValidCases() {
4); // level
},
},
{
ValidTextureOverload::kLoad3dF32,
"textureLoad(t : texture_3d<f32>,\n"
" coords : vec3<i32>) -> vec4<f32>",
TextureKind::kRegular,
type::TextureDimension::k3d,
TextureDataType::kF32,
"textureLoad",
[](ProgramBuilder* b) {
return b->ExprList("texture", // t
b->vec3<i32>(1, 2, 3)); // coords
},
},
{
ValidTextureOverload::kLoad3dU32,
"textureLoad(t : texture_3d<u32>,\n"
" coords : vec3<i32>) -> vec4<u32>",
TextureKind::kRegular,
type::TextureDimension::k3d,
TextureDataType::kU32,
"textureLoad",
[](ProgramBuilder* b) {
return b->ExprList("texture", // t
b->vec3<i32>(1, 2, 3)); // coords
},
},
{
ValidTextureOverload::kLoad3dI32,
"textureLoad(t : texture_3d<i32>,\n"
" coords : vec3<i32>) -> vec4<i32>",
TextureKind::kRegular,
type::TextureDimension::k3d,
TextureDataType::kI32,
"textureLoad",
[](ProgramBuilder* b) {
return b->ExprList("texture", // t
b->vec3<i32>(1, 2, 3)); // coords
},
},
{
ValidTextureOverload::kLoad3dLevelF32,
"textureLoad(t : texture_3d<f32>,\n"
@@ -2105,19 +1943,6 @@ std::vector<TextureOverloadCase> TextureOverloadCase::ValidCases() {
4); // sample_index
},
},
{
ValidTextureOverload::kLoadDepth2dF32,
"textureLoad(t : texture_depth_2d,\n"
" coords : vec2<i32>) -> f32",
TextureKind::kDepth,
type::TextureDimension::k2d,
TextureDataType::kF32,
"textureLoad",
[](ProgramBuilder* b) {
return b->ExprList("texture", // t
b->vec2<i32>(1, 2)); // coords
},
},
{
ValidTextureOverload::kLoadDepth2dLevelF32,
"textureLoad(t : texture_depth_2d,\n"
@@ -2133,21 +1958,6 @@ std::vector<TextureOverloadCase> TextureOverloadCase::ValidCases() {
3); // level
},
},
{
ValidTextureOverload::kLoadDepth2dArrayF32,
"textureLoad(t : texture_depth_2d_array,\n"
" coords : vec2<i32>,\n"
" array_index : i32) -> f32",
TextureKind::kDepth,
type::TextureDimension::k2dArray,
TextureDataType::kF32,
"textureLoad",
[](ProgramBuilder* b) {
return b->ExprList("texture", // t
b->vec2<i32>(1, 2), // coords
3); // array_index
},
},
{
ValidTextureOverload::kLoadDepth2dArrayLevelF32,
"textureLoad(t : texture_depth_2d_array,\n"

14
src/ast/intrinsic_texture_helper_test.h
View File

@@ -134,27 +134,15 @@ enum class ValidTextureOverload {
kSampleCompareDepth2dArrayOffsetF32,
kSampleCompareDepthCubeF32,
kSampleCompareDepthCubeArrayF32,
kLoad1dF32,
kLoad1dU32,
kLoad1dI32,
kLoad1dLevelF32,
kLoad1dLevelU32,
kLoad1dLevelI32,
kLoad2dF32,
kLoad2dU32,
kLoad2dI32,
kLoad2dLevelF32,
kLoad2dLevelU32,
kLoad2dLevelI32,
kLoad2dArrayF32,
kLoad2dArrayU32,
kLoad2dArrayI32,
kLoad2dArrayLevelF32,
kLoad2dArrayLevelU32,
kLoad2dArrayLevelI32,
kLoad3dF32,
kLoad3dU32,
kLoad3dI32,
kLoad3dLevelF32,
kLoad3dLevelU32,
kLoad3dLevelI32,
@@ -164,9 +152,7 @@ enum class ValidTextureOverload {
kLoadMultisampled2dArrayF32,
kLoadMultisampled2dArrayU32,
kLoadMultisampled2dArrayI32,
kLoadDepth2dF32,
kLoadDepth2dLevelF32,
kLoadDepth2dArrayF32,
kLoadDepth2dArrayLevelF32,
kLoadStorageRO1dRgba32float, // Not permutated for all texel formats
kLoadStorageRO2dRgba8unorm,