Skip to content
This repository was archived by the owner on Nov 30, 2020. It is now read-only.

Commit 003f57a

Browse files
committed
Integrate feedback from @Chman
Better name for RenderViewportScale value Use ShaderIDs instead of raw string (hashing)
1 parent a1bd5fb commit 003f57a

4 files changed

Lines changed: 9 additions & 8 deletions

File tree

PostProcessing/Runtime/PostProcessLayer.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,11 +275,11 @@ void OnPreCull()
275275
if (m_Camera.stereoEnabled)
276276
{
277277
m_Camera.ResetStereoProjectionMatrices();
278-
Shader.SetGlobalFloat("rvsGlobal", XRSettings.renderViewportScale);
278+
Shader.SetGlobalFloat(ShaderIDs.RenderViewportScaleFactor, XRSettings.renderViewportScale);
279279
}
280280
else
281281
{
282-
Shader.SetGlobalFloat("rvsGlobal", 1.0f);
282+
Shader.SetGlobalFloat(ShaderIDs.RenderViewportScaleFactor, 1.0f);
283283
}
284284

285285
BuildCommandBuffers();

PostProcessing/Runtime/Utils/RuntimeUtilities.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,6 @@ public static void BlitFullscreenTriangle(Texture source, RenderTexture destinat
205205
// Assumes that both textures have the exact same type and format
206206
public static void CopyTexture(CommandBuffer cmd, RenderTargetIdentifier source, RenderTargetIdentifier destination)
207207
{
208-
// TODO: Not sure if this works with texture arrays...
209208
if (SystemInfo.copyTextureSupport > CopyTextureSupport.None)
210209
{
211210
cmd.CopyTexture(source, destination);

PostProcessing/Runtime/Utils/ShaderIDs.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,5 +144,7 @@ static class ShaderIDs
144144
internal static readonly int WaveformSource = Shader.PropertyToID("_WaveformSource");
145145
internal static readonly int WaveformBuffer = Shader.PropertyToID("_WaveformBuffer");
146146
internal static readonly int VectorscopeBuffer = Shader.PropertyToID("_VectorscopeBuffer");
147+
148+
internal static readonly int RenderViewportScaleFactor = Shader.PropertyToID("_RenderViewportScaleFactor");
147149
}
148150
}

PostProcessing/Shaders/xRLib.hlsl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ CBUFFER_START(UnityStereoEyeIndex)
2424
CBUFFER_END
2525
#endif
2626

27-
float rvsGlobal;
27+
float _RenderViewportScaleFactor;
2828

2929
float2 UnityStereoScreenSpaceUVAdjust(float2 uv, float4 scaleAndOffset)
3030
{
@@ -45,7 +45,7 @@ float2 UnityStereoClampScaleOffset(float2 uv, float4 scaleAndOffset)
4545
float2 TransformStereoScreenSpaceTex(float2 uv, float w)
4646
{
4747
float4 scaleOffset = unity_StereoScaleOffset[unity_StereoEyeIndex];
48-
scaleOffset.xy *= rvsGlobal;
48+
scaleOffset.xy *= _RenderViewportScaleFactor;
4949
return uv.xy * scaleOffset.xy + scaleOffset.zw * w;
5050
}
5151

@@ -62,13 +62,13 @@ float4 UnityStereoTransformScreenSpaceTex(float4 uv)
6262
float2 UnityStereoClamp(float2 uv)
6363
{
6464
float4 scaleOffset = unity_StereoScaleOffset[unity_StereoEyeIndex];
65-
scaleOffset.xy *= rvsGlobal;
65+
scaleOffset.xy *= _RenderViewportScaleFactor;
6666
return UnityStereoClampScaleOffset(uv, scaleOffset);
6767
}
6868
#else
6969
float2 TransformStereoScreenSpaceTex(float2 uv, float w)
7070
{
71-
return uv * rvsGlobal;
71+
return uv * _RenderViewportScaleFactor;
7272
}
7373

7474
float2 UnityStereoTransformScreenSpaceTex(float2 uv)
@@ -78,7 +78,7 @@ float2 UnityStereoTransformScreenSpaceTex(float2 uv)
7878

7979
float2 UnityStereoClamp(float2 uv)
8080
{
81-
float4 scaleOffset = float4(rvsGlobal, rvsGlobal, 0.f, 0.f);
81+
float4 scaleOffset = float4(_RenderViewportScaleFactor, _RenderViewportScaleFactor, 0.f, 0.f);
8282
return UnityStereoClampScaleOffset(uv, scaleOffset);
8383
}
8484
#endif

0 commit comments

Comments
 (0)