@@ -130,15 +130,15 @@ static GraphicsPipelineStateCreateInfoX& CreateShaders(RenderDeviceWithCache_E&
130130 ShaderCI.Macros = Macros;
131131 ShaderCI.CompileFlags = PackMatrixRowMajor ? SHADER_COMPILE_FLAG_PACK_MATRIX_ROW_MAJOR : SHADER_COMPILE_FLAG_NONE;
132132
133- auto pHnFxCompoundSourceFactory = HnShaderSourceFactory::CreateHnFxCompoundFactory ();
134- ShaderCI.pShaderSourceStreamFactory = pHnFxCompoundSourceFactory;
133+ RefCntAutoPtr<IShaderSourceInputStreamFactory> pHnFxCompoundSourceFactory = HnShaderSourceFactory::CreateHnFxCompoundFactory ();
134+ ShaderCI.pShaderSourceStreamFactory = pHnFxCompoundSourceFactory;
135135
136136 {
137137 ShaderCI.Desc = {" Full-screen Triangle VS" , SHADER_TYPE_VERTEX, true };
138138 ShaderCI.EntryPoint = " FullScreenTriangleVS" ;
139139 ShaderCI.FilePath = " FullScreenTriangleVS.fx" ;
140140
141- auto pVS = Device.CreateShader (ShaderCI); // Throws exception in case of error
141+ RefCntAutoPtr<IShader> pVS = Device.CreateShader (ShaderCI); // Throws exception in case of error
142142 PsoCI.AddShader (pVS);
143143 }
144144
@@ -147,7 +147,7 @@ static GraphicsPipelineStateCreateInfoX& CreateShaders(RenderDeviceWithCache_E&
147147 ShaderCI.EntryPoint = " main" ;
148148 ShaderCI.FilePath = PSFilePath;
149149
150- auto pPS = Device.CreateShader (ShaderCI); // Throws exception in case of error
150+ RefCntAutoPtr<IShader> pPS = Device.CreateShader (ShaderCI); // Throws exception in case of error
151151 PsoCI.AddShader (pPS);
152152 }
153153
@@ -233,7 +233,7 @@ void HnPostProcessTask::PostProcessingTechnique::PreparePSO(TEXTURE_FORMAT RTVFo
233233
234234void HnPostProcessTask::PostProcessingTechnique::PrepareSRB (ITextureView* pClosestSelectedLocationSRV, Uint32 FrameIdx)
235235{
236- const auto * FrameTargets = PPTask.m_FrameTargets ;
236+ const HnFrameRenderTargets * FrameTargets = PPTask.m_FrameTargets ;
237237
238238 for (Uint32 i = 0 ; i < HnFrameRenderTargets::GBUFFER_TARGET_COUNT; ++i)
239239 {
@@ -264,9 +264,9 @@ void HnPostProcessTask::PostProcessingTechnique::PrepareSRB(ITextureView* pClose
264264 ITextureView* pSSAO = PPTask.m_SSAO ->GetAmbientOcclusionSRV ();
265265 VERIFY_EXPR (pSSAO != nullptr );
266266
267- size_t ResIdx = FrameIdx % Resources.size ();
268- auto & SRB = Resources[ResIdx].SRB ;
269- auto & ShaderVars = Resources[ResIdx].Vars ;
267+ const size_t ResIdx = FrameIdx % Resources.size ();
268+ RefCntAutoPtr<IShaderResourceBinding>& SRB = Resources[ResIdx].SRB ;
269+ ShaderResources::ShaderVariables& ShaderVars = Resources[ResIdx].Vars ;
270270
271271 ITextureView* pOffscreenColorSRV = FrameTargets->GBufferSRVs [HnFrameRenderTargets::GBUFFER_TARGET_SCENE_COLOR];
272272 ITextureView* pSpecularIblSRV = FrameTargets->GBufferSRVs [HnFrameRenderTargets::GBUFFER_TARGET_IBL];
@@ -439,9 +439,9 @@ void HnPostProcessTask::CopyFrameTechnique::PrepareSRB(Uint32 FrameIdx)
439439 return ;
440440 }
441441
442- size_t ResIdx = FrameIdx % Resources.size ();
443- auto & SRB = Resources[ResIdx].SRB ;
444- auto & ShaderVars = Resources[ResIdx].Vars ;
442+ const size_t ResIdx = FrameIdx % Resources.size ();
443+ RefCntAutoPtr<IShaderResourceBinding>& SRB = Resources[ResIdx].SRB ;
444+ ShaderResources::ShaderVariables& ShaderVars = Resources[ResIdx].Vars ;
445445
446446 ITextureView* pAccumulatedFrameSRV = pAccumulatedFrame->GetDefaultView (TEXTURE_VIEW_SHADER_RESOURCE);
447447 ITextureView* pDepthSRV = PPTask.m_FrameTargets ->DepthDSV ->GetTexture ()->GetDefaultView (TEXTURE_VIEW_SHADER_RESOURCE);
@@ -519,7 +519,7 @@ void HnPostProcessTask::Prepare(pxr::HdTaskContext* TaskCtx,
519519 }
520520
521521 ITextureView* ClosestSelectedLocationSRV = nullptr ;
522- if (auto * ClosestSelectedLocationRTV = GetRenderBufferTarget (*RenderIndex, TaskCtx, HnRenderResourceTokens->closestSelectedLocationFinalTarget ))
522+ if (ITextureView * ClosestSelectedLocationRTV = GetRenderBufferTarget (*RenderIndex, TaskCtx, HnRenderResourceTokens->closestSelectedLocationFinalTarget ))
523523 {
524524 ClosestSelectedLocationSRV = ClosestSelectedLocationRTV->GetTexture ()->GetDefaultView (TEXTURE_VIEW_SHADER_RESOURCE);
525525 if (ClosestSelectedLocationSRV == nullptr )
0 commit comments