summaryrefslogtreecommitdiffstats
path: root/source/slang/slang-core-module-textures.cpp
diff options
context:
space:
mode:
authorAnders Leino <aleino@nvidia.com>2024-11-14 21:49:01 +0200
committerGitHub <noreply@github.com>2024-11-14 11:49:01 -0800
commitf0bc4642a563e2318634b38a5a7ac2c3ddd68917 (patch)
tree3a17a128af7a854006fb62184db53428b70830a6 /source/slang/slang-core-module-textures.cpp
parent147ceb1991454b7a5ba6f3ec0c149dd40360a31d (diff)
Insert some casts for WGSL texture attribute queries (#5560)
* Add new texture sampling test for WebGPU There are no 1d array textures in WGSL, so add texture-sampling-no-1d-arrays.slang based on texture-sampling.slang, but without 1d texture arrays. This helps to address issue #4943. * Insert needed conversion when querying texture attributes in WGSL This helps to address issue #4943. --------- Co-authored-by: Yong He <yonghe@outlook.com>
Diffstat (limited to 'source/slang/slang-core-module-textures.cpp')
-rw-r--r--source/slang/slang-core-module-textures.cpp90
1 files changed, 77 insertions, 13 deletions
diff --git a/source/slang/slang-core-module-textures.cpp b/source/slang/slang-core-module-textures.cpp
index e0b8d2b27..22c1fc63f 100644
--- a/source/slang/slang-core-module-textures.cpp
+++ b/source/slang/slang-core-module-textures.cpp
@@ -180,6 +180,55 @@ void TextureTypeInfo::writeFunc(
readNoneMode);
}
+enum class DimType
+{
+ Float,
+ Int,
+ UInt,
+
+ Count,
+};
+
+// The WGSL texture attribute types for 'expr' are unsigned int, and anything else requires a
+// conversion.
+template<typename S>
+static String wgslTextureAttributeConversion(DimType type, S expr)
+{
+
+ switch (type)
+ {
+
+ case DimType::UInt:
+ return expr;
+
+
+ case DimType::Float:
+ {
+ // Conversion to float is exact for values <= 2^24.
+ String castExpr("f32(");
+ castExpr.append(expr);
+ castExpr.append(")");
+ return castExpr;
+ }
+ break;
+
+ case DimType::Int:
+ {
+ // We can assume two's complement and just do a bitcast, since texture dimensions can't
+ // be anywhere near big enough to yield a negative result.
+ String castExpr("bitcast<i32>(");
+ castExpr.append(expr);
+ castExpr.append(")");
+ return castExpr;
+ }
+ break;
+
+ default:
+ SLANG_UNREACHABLE("Unexpected DimType enum value");
+ break;
+ };
+}
+
void TextureTypeInfo::writeGetDimensionFunctions()
{
static const char* kComponentNames[]{"x", "y", "z", "w"};
@@ -187,10 +236,11 @@ void TextureTypeInfo::writeGetDimensionFunctions()
SlangResourceShape baseShape = base.baseShape;
// `GetDimensions`
- const char* dimParamTypes[] = {"out float ", "out int ", "out uint "};
- const char* dimParamTypesInner[] = {"float", "int", "uint"};
- for (int tid = 0; tid < 3; tid++)
+ const char* dimParamTypes[int(DimType::Count)] = {"out float ", "out int ", "out uint "};
+ const char* dimParamTypesInner[int(DimType::Count)] = {"float", "int", "uint"};
+ for (int tid = 0; tid < int(DimType::Count); tid++)
{
+ DimType dimType = DimType(tid);
auto t = dimParamTypes[tid];
auto rawT = dimParamTypesInner[tid];
@@ -227,8 +277,11 @@ void TextureTypeInfo::writeGetDimensionFunctions()
params << t << "width";
metal << "(*($" << String(paramCount) << ") = $0.get_width("
<< String(metalMipLevel) << ")),";
- wgsl << "($" << String(paramCount) << ") = textureDimensions($0"
- << (includeMipInfo ? ", $1" : "") << ");";
+ wgsl << "($" << String(paramCount) << ") = "
+ << wgslTextureAttributeConversion(
+ dimType,
+ String("textureDimensions($0") + (includeMipInfo ? ", $1" : "") + ")")
+ << ";";
sizeDimCount = 1;
break;
@@ -240,13 +293,15 @@ void TextureTypeInfo::writeGetDimensionFunctions()
metal << "(*($" << String(paramCount) << ") = $0.get_width("
<< String(metalMipLevel) << ")),";
wgsl << "var dim = textureDimensions($0" << (includeMipInfo ? ", $1" : "") << ");";
- wgsl << "($" << String(paramCount) << ") = dim.x;";
+ wgsl << "($" << String(paramCount)
+ << ") = " << wgslTextureAttributeConversion(dimType, "dim.x") << ";";
++paramCount;
params << t << "height";
metal << "(*($" << String(paramCount) << ") = $0.get_height("
<< String(metalMipLevel) << ")),";
- wgsl << "($" << String(paramCount) << ") = dim.y;";
+ wgsl << "($" << String(paramCount)
+ << ") = " << wgslTextureAttributeConversion(dimType, "dim.y") << ";";
sizeDimCount = 2;
break;
@@ -257,19 +312,22 @@ void TextureTypeInfo::writeGetDimensionFunctions()
metal << "(*($" << String(paramCount) << ") = $0.get_width("
<< String(metalMipLevel) << ")),";
wgsl << "var dim = textureDimensions($0" << (includeMipInfo ? ", $1" : "") << ");";
- wgsl << "($" << String(paramCount) << ") = dim.x;";
+ wgsl << "($" << String(paramCount)
+ << ") = " << wgslTextureAttributeConversion(dimType, "dim.x") << ";";
++paramCount;
params << t << "height,";
metal << "(*($" << String(paramCount) << ") = $0.get_height("
<< String(metalMipLevel) << ")),";
- wgsl << "($" << String(paramCount) << ") = dim.y;";
+ wgsl << "($" << String(paramCount)
+ << ") = " << wgslTextureAttributeConversion(dimType, "dim.y") << ";";
++paramCount;
params << t << "depth";
metal << "(*($" << String(paramCount) << ") = $0.get_depth("
<< String(metalMipLevel) << ")),";
- wgsl << "($" << String(paramCount) << ") = dim.z;";
+ wgsl << "($" << String(paramCount)
+ << ") = " << wgslTextureAttributeConversion(dimType, "dim.z") << ";";
sizeDimCount = 3;
break;
@@ -285,7 +343,9 @@ void TextureTypeInfo::writeGetDimensionFunctions()
++paramCount;
params << ", " << t << "elements";
metal << "(*($" << String(paramCount) << ") = $0.get_array_size()),";
- wgsl << "($" << String(paramCount) << ") = textureNumLayers($0);";
+ wgsl << "($" << String(paramCount)
+ << ") = " << wgslTextureAttributeConversion(dimType, "textureNumLayers($0)")
+ << ";";
}
if (isMultisample)
@@ -293,7 +353,9 @@ void TextureTypeInfo::writeGetDimensionFunctions()
++paramCount;
params << ", " << t << "sampleCount";
metal << "(*($" << String(paramCount) << ") = $0.get_num_samples()),";
- wgsl << "($" << String(paramCount) << ") = textureNumSamples($0);";
+ wgsl << "($" << String(paramCount)
+ << ") = " << wgslTextureAttributeConversion(dimType, "textureNumSamples($0)")
+ << ";";
}
if (includeMipInfo)
@@ -301,7 +363,9 @@ void TextureTypeInfo::writeGetDimensionFunctions()
++paramCount;
params << ", " << t << "numberOfLevels";
metal << "(*($" << String(paramCount) << ") = $0.get_num_mip_levels()),";
- wgsl << "($" << String(paramCount) << ") = textureNumLevels($0);";
+ wgsl << "($" << String(paramCount)
+ << ") = " << wgslTextureAttributeConversion(dimType, "textureNumLevels($0)")
+ << ";";
}
metal.reduceLength(metal.getLength() - 1); // drop the last comma