AuroraMiddleware/SPIRV-Cross
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2148 from etang-cw/FixDref

Browse Source 
MSL: Fix dref lod workaround on combined texture/samplers
This commit is contained in:
Hans-Kristian Arntzen 2023-05-16 17:05:19 +02:00 committed by GitHub
commit 28b11e010a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
spirv_msl.cpp
View File

@ -10902,26 +10902,29 @@ string CompilerMSL::to_function_args(const TextureFunctionArguments &args, bool
// Therefore, dP/dx = dP/dy = exp2(lod)/extent. // Therefore, dP/dx = dP/dy = exp2(lod)/extent.
// (Subtracting 0.5 before exponentiation gives better results.) // (Subtracting 0.5 before exponentiation gives better results.)
string grad_opt, extent; string grad_opt, extent;
VariableID base_img = img;
if (auto *combined = maybe_get<SPIRCombinedImageSampler>(img))
base_img = combined->image;
switch (imgtype.image.dim) switch (imgtype.image.dim)
{ {
case Dim1D: case Dim1D:
grad_opt = "2d"; grad_opt = "2d";
extent = join("float2(", to_expression(img), ".get_width(), 1.0)"); extent = join("float2(", to_expression(base_img), ".get_width(), 1.0)");
break; break;
case Dim2D: case Dim2D:
grad_opt = "2d"; grad_opt = "2d";
extent = join("float2(", to_expression(img), ".get_width(), ", to_expression(img), ".get_height())"); extent = join("float2(", to_expression(base_img), ".get_width(), ", to_expression(base_img), ".get_height())");
break; break;
case DimCube: case DimCube:
if (imgtype.image.arrayed && msl_options.emulate_cube_array) if (imgtype.image.arrayed && msl_options.emulate_cube_array)
{ {
grad_opt = "2d"; grad_opt = "2d";
extent = join("float2(", to_expression(img), ".get_width())"); extent = join("float2(", to_expression(base_img), ".get_width())");
} }
else else
{ {
grad_opt = "cube"; grad_opt = "cube";
extent = join("float3(", to_expression(img), ".get_width())"); extent = join("float3(", to_expression(base_img), ".get_width())");
} }
break; break;
default: default: