diff --git a/src/back/hlsl/help.rs b/src/back/hlsl/help.rs index a98cc38596..4d9265d727 100644 --- a/src/back/hlsl/help.rs +++ b/src/back/hlsl/help.rs @@ -244,7 +244,7 @@ impl<'a, W: Write> super::Writer<'a, W> { ImageDimension as IDim, }; - const ARGUMENT_VARIABLE_NAME: &str = "texture"; + const ARGUMENT_VARIABLE_NAME: &str = "tex"; const RETURN_VARIABLE_NAME: &str = "ret"; const MIP_LEVEL_PARAM: &str = "mip_level"; diff --git a/tests/out/hlsl/image.hlsl b/tests/out/hlsl/image.hlsl index 902418a046..d53a95844e 100644 --- a/tests/out/hlsl/image.hlsl +++ b/tests/out/hlsl/image.hlsl @@ -17,10 +17,10 @@ SamplerState sampler_reg : register(s0, space1); SamplerComparisonState sampler_cmp : register(s1, space1); Texture2D image_2d_depth : register(t2, space1); -int2 NagaRWDimensions2D(RWTexture2D texture) +int2 NagaRWDimensions2D(RWTexture2D tex) { uint4 ret; - texture.GetDimensions(ret.x, ret.y); + tex.GetDimensions(ret.x, ret.y); return ret.xy; } @@ -38,136 +38,136 @@ void main(uint3 local_id : SV_GroupThreadID) return; } -int NagaDimensions1D(Texture1D texture) +int NagaDimensions1D(Texture1D tex) { uint4 ret; - texture.GetDimensions(0, ret.x, ret.y); + tex.GetDimensions(0, ret.x, ret.y); return ret.x; } -int2 NagaDimensions2D(Texture2D texture) +int2 NagaDimensions2D(Texture2D tex) { uint4 ret; - texture.GetDimensions(0, ret.x, ret.y, ret.z); + tex.GetDimensions(0, ret.x, ret.y, ret.z); return ret.xy; } -int NagaNumLevels2D(Texture2D texture) +int NagaNumLevels2D(Texture2D tex) { uint4 ret; - texture.GetDimensions(0, ret.x, ret.y, ret.z); + tex.GetDimensions(0, ret.x, ret.y, ret.z); return ret.z; } -int2 NagaMipDimensions2D(Texture2D texture, uint mip_level) +int2 NagaMipDimensions2D(Texture2D tex, uint mip_level) { uint4 ret; - texture.GetDimensions(mip_level, ret.x, ret.y, ret.z); + tex.GetDimensions(mip_level, ret.x, ret.y, ret.z); return ret.xy; } -int2 NagaDimensions2DArray(Texture2DArray texture) +int2 NagaDimensions2DArray(Texture2DArray tex) { uint4 ret; - texture.GetDimensions(0, ret.x, ret.y, ret.z, ret.w); + tex.GetDimensions(0, ret.x, ret.y, ret.z, ret.w); return ret.xy; } -int NagaNumLevels2DArray(Texture2DArray texture) +int NagaNumLevels2DArray(Texture2DArray tex) { uint4 ret; - texture.GetDimensions(0, ret.x, ret.y, ret.z, ret.w); + tex.GetDimensions(0, ret.x, ret.y, ret.z, ret.w); return ret.w; } -int2 NagaMipDimensions2DArray(Texture2DArray texture, uint mip_level) +int2 NagaMipDimensions2DArray(Texture2DArray tex, uint mip_level) { uint4 ret; - texture.GetDimensions(mip_level, ret.x, ret.y, ret.z, ret.w); + tex.GetDimensions(mip_level, ret.x, ret.y, ret.z, ret.w); return ret.xy; } -int NagaNumLayers2DArray(Texture2DArray texture) +int NagaNumLayers2DArray(Texture2DArray tex) { uint4 ret; - texture.GetDimensions(0, ret.x, ret.y, ret.z, ret.w); + tex.GetDimensions(0, ret.x, ret.y, ret.z, ret.w); return ret.w; } -int2 NagaDimensionsCube(TextureCube texture) +int2 NagaDimensionsCube(TextureCube tex) { uint4 ret; - texture.GetDimensions(0, ret.x, ret.y, ret.z); + tex.GetDimensions(0, ret.x, ret.y, ret.z); return ret.xy; } -int NagaNumLevelsCube(TextureCube texture) +int NagaNumLevelsCube(TextureCube tex) { uint4 ret; - texture.GetDimensions(0, ret.x, ret.y, ret.z); + tex.GetDimensions(0, ret.x, ret.y, ret.z); return ret.z; } -int2 NagaMipDimensionsCube(TextureCube texture, uint mip_level) +int2 NagaMipDimensionsCube(TextureCube tex, uint mip_level) { uint4 ret; - texture.GetDimensions(mip_level, ret.x, ret.y, ret.z); + tex.GetDimensions(mip_level, ret.x, ret.y, ret.z); return ret.xy; } -int2 NagaDimensionsCubeArray(TextureCubeArray texture) +int2 NagaDimensionsCubeArray(TextureCubeArray tex) { uint4 ret; - texture.GetDimensions(0, ret.x, ret.y, ret.z, ret.w); + tex.GetDimensions(0, ret.x, ret.y, ret.z, ret.w); return ret.xy; } -int NagaNumLevelsCubeArray(TextureCubeArray texture) +int NagaNumLevelsCubeArray(TextureCubeArray tex) { uint4 ret; - texture.GetDimensions(0, ret.x, ret.y, ret.z, ret.w); + tex.GetDimensions(0, ret.x, ret.y, ret.z, ret.w); return ret.w; } -int2 NagaMipDimensionsCubeArray(TextureCubeArray texture, uint mip_level) +int2 NagaMipDimensionsCubeArray(TextureCubeArray tex, uint mip_level) { uint4 ret; - texture.GetDimensions(mip_level, ret.x, ret.y, ret.z, ret.w); + tex.GetDimensions(mip_level, ret.x, ret.y, ret.z, ret.w); return ret.xy; } -int NagaNumLayersCubeArray(TextureCubeArray texture) +int NagaNumLayersCubeArray(TextureCubeArray tex) { uint4 ret; - texture.GetDimensions(0, ret.x, ret.y, ret.z, ret.w); + tex.GetDimensions(0, ret.x, ret.y, ret.z, ret.w); return ret.w; } -int3 NagaDimensions3D(Texture3D texture) +int3 NagaDimensions3D(Texture3D tex) { uint4 ret; - texture.GetDimensions(0, ret.x, ret.y, ret.z, ret.w); + tex.GetDimensions(0, ret.x, ret.y, ret.z, ret.w); return ret.xyz; } -int NagaNumLevels3D(Texture3D texture) +int NagaNumLevels3D(Texture3D tex) { uint4 ret; - texture.GetDimensions(0, ret.x, ret.y, ret.z, ret.w); + tex.GetDimensions(0, ret.x, ret.y, ret.z, ret.w); return ret.w; } -int3 NagaMipDimensions3D(Texture3D texture, uint mip_level) +int3 NagaMipDimensions3D(Texture3D tex, uint mip_level) { uint4 ret; - texture.GetDimensions(mip_level, ret.x, ret.y, ret.z, ret.w); + tex.GetDimensions(mip_level, ret.x, ret.y, ret.z, ret.w); return ret.xyz; } -int NagaMSNumSamples2D(Texture2DMS texture) +int NagaMSNumSamples2D(Texture2DMS tex) { uint4 ret; - texture.GetDimensions(ret.x, ret.y, ret.z); + tex.GetDimensions(ret.x, ret.y, ret.z); return ret.z; }