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

Commit ba043d8

Browse files
ChmanChman
committed
PostProcessRenderContext cleanup
1 parent 7641fb7 commit ba043d8

File tree

1 file changed

+85
-85
lines changed

1 file changed

+85
-85
lines changed

‎PostProcessing/Runtime/PostProcessRenderContext.cs

Lines changed: 85 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -104,83 +104,6 @@ public Camera camera
104104
// Current camera height in pixels
105105
public int height { get; private set; }
106106

107-
// TODO: Change w/h name to texture w/h in order to make
108-
// size usages explicit
109-
#if UNITY_2017_2_OR_NEWER
110-
RenderTextureDescriptor m_sourceDescriptor;
111-
RenderTextureDescriptor GetDescriptor(int depthBufferBits = 0, RenderTextureFormat colorFormat = RenderTextureFormat.Default, RenderTextureReadWrite readWrite = RenderTextureReadWrite.Default)
112-
{
113-
var modifiedDesc = new RenderTextureDescriptor(m_sourceDescriptor.width, m_sourceDescriptor.height,
114-
m_sourceDescriptor.colorFormat, depthBufferBits);
115-
modifiedDesc.dimension = m_sourceDescriptor.dimension;
116-
modifiedDesc.volumeDepth = m_sourceDescriptor.volumeDepth;
117-
modifiedDesc.vrUsage = m_sourceDescriptor.vrUsage;
118-
modifiedDesc.msaaSamples = m_sourceDescriptor.msaaSamples;
119-
modifiedDesc.memoryless = m_sourceDescriptor.memoryless;
120-
121-
modifiedDesc.useMipMap = m_sourceDescriptor.useMipMap;
122-
modifiedDesc.autoGenerateMips = m_sourceDescriptor.autoGenerateMips;
123-
modifiedDesc.enableRandomWrite = m_sourceDescriptor.enableRandomWrite;
124-
modifiedDesc.shadowSamplingMode = m_sourceDescriptor.shadowSamplingMode;
125-
126-
if (colorFormat != RenderTextureFormat.Default)
127-
modifiedDesc.colorFormat = colorFormat;
128-
129-
modifiedDesc.sRGB = readWrite != RenderTextureReadWrite.Linear;
130-
131-
return modifiedDesc;
132-
}
133-
#endif
134-
135-
public void GetScreenSpaceTemporaryRT(CommandBuffer cmd, int nameID,
136-
int depthBufferBits = 0, RenderTextureFormat colorFormat = RenderTextureFormat.Default, RenderTextureReadWrite readWrite = RenderTextureReadWrite.Default,
137-
FilterMode filter = FilterMode.Bilinear, int widthOverride = 0, int heightOverride = 0)
138-
{
139-
#if UNITY_2017_2_OR_NEWER
140-
var desc = GetDescriptor(depthBufferBits, colorFormat, readWrite);
141-
if (widthOverride > 0)
142-
desc.width = widthOverride;
143-
if (heightOverride > 0)
144-
desc.height = heightOverride;
145-
146-
cmd.GetTemporaryRT(nameID, desc, filter);
147-
#else
148-
int actualWidth = width;
149-
int actualHeight = height;
150-
if (widthOverride > 0)
151-
actualWidth = widthOverride;
152-
if (heightOverride > 0)
153-
actualHeight = heightOverride;
154-
155-
cmd.GetTemporaryRT(nameID, actualWidth, actualHeight, depthBufferBits, filter, colorFormat, readWrite);
156-
// TODO: How to handle MSAA for XR in older versions? Query cam?
157-
// TODO: Pass in vrUsage into the args
158-
#endif
159-
}
160-
161-
public RenderTexture GetScreenSpaceTemporaryRT(int depthBufferBits = 0, RenderTextureFormat colorFormat = RenderTextureFormat.Default,
162-
RenderTextureReadWrite readWrite = RenderTextureReadWrite.Default, int widthOverride = 0, int heightOverride = 0)
163-
{
164-
#if UNITY_2017_2_OR_NEWER
165-
var desc = GetDescriptor(depthBufferBits, colorFormat, readWrite);
166-
if (widthOverride > 0)
167-
desc.width = widthOverride;
168-
if (heightOverride > 0)
169-
desc.height = heightOverride;
170-
171-
return RenderTexture.GetTemporary(desc);
172-
#else
173-
int actualWidth = width;
174-
int actualHeight = height;
175-
if (widthOverride > 0)
176-
actualWidth = widthOverride;
177-
if (heightOverride > 0)
178-
actualHeight = heightOverride;
179-
180-
return RenderTexture.GetTemporary(actualWidth, actualHeight, depthBufferBits, colorFormat, readWrite);
181-
#endif
182-
}
183-
184107
public bool stereoActive { get; private set; }
185108

186109
// Current active rendering eye (for XR)
@@ -201,6 +124,15 @@ public RenderTexture GetScreenSpaceTemporaryRT(int depthBufferBits = 0, RenderTe
201124
// to do temporal reprojection (see: Depth of Field)
202125
public TemporalAntialiasing temporalAntialiasing { get; internal set; }
203126

127+
// Internal values used for builtin effects
128+
// Beware, these may not have been set before a specific builtin effect has been executed
129+
internal PropertySheet uberSheet;
130+
internal Texture autoExposureTexture;
131+
internal LogHistogram logHistogram;
132+
internal Texture logLut;
133+
internal AutoExposure autoExposure;
134+
internal int bloomBufferNameID;
135+
204136
public void Reset()
205137
{
206138
m_Camera = null;
@@ -261,13 +193,81 @@ public void PushDebugOverlay(CommandBuffer cmd, RenderTargetIdentifier source, P
261193
debugLayer.PushDebugOverlay(cmd, source, sheet, pass);
262194
}
263195

264-
// Internal values used for builtin effects
265-
// Beware, these may not have been set before a specific builtin effect has been executed
266-
internal PropertySheet uberSheet;
267-
internal Texture autoExposureTexture;
268-
internal LogHistogram logHistogram;
269-
internal Texture logLut;
270-
internal AutoExposure autoExposure;
271-
internal int bloomBufferNameID;
196+
// TODO: Change w/h name to texture w/h in order to make
197+
// size usages explicit
198+
#if UNITY_2017_2_OR_NEWER
199+
RenderTextureDescriptor m_sourceDescriptor;
200+
RenderTextureDescriptor GetDescriptor(int depthBufferBits = 0, RenderTextureFormat colorFormat = RenderTextureFormat.Default, RenderTextureReadWrite readWrite = RenderTextureReadWrite.Default)
201+
{
202+
var modifiedDesc = new RenderTextureDescriptor(m_sourceDescriptor.width, m_sourceDescriptor.height,
203+
m_sourceDescriptor.colorFormat, depthBufferBits);
204+
modifiedDesc.dimension = m_sourceDescriptor.dimension;
205+
modifiedDesc.volumeDepth = m_sourceDescriptor.volumeDepth;
206+
modifiedDesc.vrUsage = m_sourceDescriptor.vrUsage;
207+
modifiedDesc.msaaSamples = m_sourceDescriptor.msaaSamples;
208+
modifiedDesc.memoryless = m_sourceDescriptor.memoryless;
209+
210+
modifiedDesc.useMipMap = m_sourceDescriptor.useMipMap;
211+
modifiedDesc.autoGenerateMips = m_sourceDescriptor.autoGenerateMips;
212+
modifiedDesc.enableRandomWrite = m_sourceDescriptor.enableRandomWrite;
213+
modifiedDesc.shadowSamplingMode = m_sourceDescriptor.shadowSamplingMode;
214+
215+
if (colorFormat != RenderTextureFormat.Default)
216+
modifiedDesc.colorFormat = colorFormat;
217+
218+
modifiedDesc.sRGB = readWrite != RenderTextureReadWrite.Linear;
219+
220+
return modifiedDesc;
221+
}
222+
#endif
223+
224+
public void GetScreenSpaceTemporaryRT(CommandBuffer cmd, int nameID,
225+
int depthBufferBits = 0, RenderTextureFormat colorFormat = RenderTextureFormat.Default, RenderTextureReadWrite readWrite = RenderTextureReadWrite.Default,
226+
FilterMode filter = FilterMode.Bilinear, int widthOverride = 0, int heightOverride = 0)
227+
{
228+
#if UNITY_2017_2_OR_NEWER
229+
var desc = GetDescriptor(depthBufferBits, colorFormat, readWrite);
230+
if (widthOverride > 0)
231+
desc.width = widthOverride;
232+
if (heightOverride > 0)
233+
desc.height = heightOverride;
234+
235+
cmd.GetTemporaryRT(nameID, desc, filter);
236+
#else
237+
int actualWidth = width;
238+
int actualHeight = height;
239+
if (widthOverride > 0)
240+
actualWidth = widthOverride;
241+
if (heightOverride > 0)
242+
actualHeight = heightOverride;
243+
244+
cmd.GetTemporaryRT(nameID, actualWidth, actualHeight, depthBufferBits, filter, colorFormat, readWrite);
245+
// TODO: How to handle MSAA for XR in older versions? Query cam?
246+
// TODO: Pass in vrUsage into the args
247+
#endif
248+
}
249+
250+
public RenderTexture GetScreenSpaceTemporaryRT(int depthBufferBits = 0, RenderTextureFormat colorFormat = RenderTextureFormat.Default,
251+
RenderTextureReadWrite readWrite = RenderTextureReadWrite.Default, int widthOverride = 0, int heightOverride = 0)
252+
{
253+
#if UNITY_2017_2_OR_NEWER
254+
var desc = GetDescriptor(depthBufferBits, colorFormat, readWrite);
255+
if (widthOverride > 0)
256+
desc.width = widthOverride;
257+
if (heightOverride > 0)
258+
desc.height = heightOverride;
259+
260+
return RenderTexture.GetTemporary(desc);
261+
#else
262+
int actualWidth = width;
263+
int actualHeight = height;
264+
if (widthOverride > 0)
265+
actualWidth = widthOverride;
266+
if (heightOverride > 0)
267+
actualHeight = heightOverride;
268+
269+
return RenderTexture.GetTemporary(actualWidth, actualHeight, depthBufferBits, colorFormat, readWrite);
270+
#endif
271+
}
272272
}
273273
}

0 commit comments

Comments
 (0)