Fix double ShaderResourceView creation for some cases in R3 and R4.

intorr · intorr · commit 10efe46222b6 · 2018-02-13T18:51:18.000+05:00
diff --git a/src/Layers/xrRenderDX10/dx10SH_Texture.cpp b/src/Layers/xrRenderDX10/dx10SH_Texture.cpp
@@ -547,10 +547,11 @@ void CTexture::Load()
             // pSurface->SetPriority	(PRIORITY_NORMAL);
             flags.MemoryUsage = mem;
         }
+
+        if (pSurface && bCreateView)
+            CHK_DX(HW.pDevice->CreateShaderResourceView(pSurface, NULL, &m_pSRView));
     }
 
-    if (pSurface && bCreateView)
-        CHK_DX(HW.pDevice->CreateShaderResourceView(pSurface, NULL, &m_pSRView));
     PostLoad();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -547,10 +547,11 @@ void CTexture::Load()`
`547`	`547`	`// pSurface->SetPriority (PRIORITY_NORMAL);`
`548`	`548`	`flags.MemoryUsage = mem;`
`549`	`549`	`}`
	`550`	`+`
	`551`	`+ if (pSurface && bCreateView)`
	`552`	`+ CHK_DX(HW.pDevice->CreateShaderResourceView(pSurface, NULL, &m_pSRView));`
`550`	`553`	`}`
`551`	`554`
`552`		`- if (pSurface && bCreateView)`
`553`		`- CHK_DX(HW.pDevice->CreateShaderResourceView(pSurface, NULL, &m_pSRView));`
`554`	`555`	`PostLoad();`
`555`	`556`	`}`
`556`	`557`