Cleanup some inconsistent ID3D types

Author: yohjimane

src/Layers/xrRender/SH_RT.h

@@ -34,7 +34,7 @@ class CRT : public xr_resource_named
     ID3DDepthStencilView* pZRT[R__NUM_CONTEXTS]{};
     ID3DDepthStencilView* dsv_all{};
     xr_vector<ID3DDepthStencilView*> dsv_per_slice;
-    ID3D11UnorderedAccessView* pUAView{};
+    ID3DUnorderedAccessView* pUAView{};
 #elif defined(USE_OGL)
     GLuint pRT{};
     GLuint pZRT{};

src/Layers/xrRenderDX11/CommonTypes.h

@@ -47,6 +47,7 @@ using ID3DShaderResourceView        = ID3D11ShaderResourceView;
 using ID3DQuery                     = ID3D11Query;
 using ID3DDevice                    = ID3D11Device;
 using ID3DDeviceContext             = ID3D11DeviceContext;
+using ID3DUnorderedAccessView = ID3D11UnorderedAccessView;
 
 constexpr auto D3D_COMMONSHADER_SAMPLER_SLOT_COUNT = D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT;
 

src/Layers/xrRenderDX11/dx11ComputeTest.cpp

@@ -219,7 +219,7 @@ bool ComputeTest::RunComputeShader()
     context->CSSetConstantBuffers(0, 1, &s_params_cb);
     context->CSSetShaderResources(0, 1, &s_input_srv);
 
-    ID3D11UnorderedAccessView* uavs[2] = { s_output_uav, s_counter_uav };
+    ID3DUnorderedAccessView* uavs[2] = { s_output_uav, s_counter_uav };
     context->CSSetUnorderedAccessViews(0, 2, uavs, nullptr);
 
     // Dispatch
@@ -230,8 +230,8 @@ bool ComputeTest::RunComputeShader()
     context->Dispatch(num_groups, 1, 1);
 
     // Unbind resources
-    ID3D11ShaderResourceView* null_srv[1] = { nullptr };
-    ID3D11UnorderedAccessView* null_uav[2] = { nullptr, nullptr };
+    ID3DShaderResourceView* null_srv[1] = { nullptr };
+    ID3DUnorderedAccessView* null_uav[2] = { nullptr, nullptr };
     context->CSSetShaderResources(0, 1, null_srv);
     context->CSSetUnorderedAccessViews(0, 2, null_uav, nullptr);
 

src/Layers/xrRenderDX11/dx11DetailManager_Compute.cpp

@@ -414,7 +414,7 @@ void DetailComputeManager::DispatchCulling(CBackend& cmd_list, const Fmatrix& vi
     context->CSSetShaderResources(0, 1, &m_gpu.instance_buffer_srv);
 
     // Bind output UAVs
-    ID3D11UnorderedAccessView* uavs[5] = {
+    ID3DUnorderedAccessView* uavs[5] = {
         m_gpu.visible_indices_uav[0], // still
         m_gpu.visible_indices_uav[1], // wave1
         m_gpu.visible_indices_uav[2], // wave2
@@ -434,8 +434,8 @@ void DetailComputeManager::DispatchCulling(CBackend& cmd_list, const Fmatrix& vi
     // ===========================
     // Unbind resources
     // ===========================
-    ID3D11ShaderResourceView* null_srv[1] = { nullptr };
-    ID3D11UnorderedAccessView* null_uav[5] = { nullptr, nullptr, nullptr, nullptr, nullptr };
+    ID3DShaderResourceView* null_srv[1] = { nullptr };
+    ID3DUnorderedAccessView* null_uav[5] = { nullptr, nullptr, nullptr, nullptr, nullptr };
     context->CSSetShaderResources(0, 1, null_srv);
     context->CSSetUnorderedAccessViews(0, 5, null_uav, nullptr);
 

src/Layers/xrRenderPC_R4/r4_rendertarget_phase_hdao.cpp

@@ -23,8 +23,8 @@ void CRenderTarget::phase_hdao()
 
         // set the cs shader output
         u32 UAVInitialCounts = 1;
-        ID3D11UnorderedAccessView* uav[1] = {0};
-        ID3D11ShaderResourceView* srv[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+        ID3DUnorderedAccessView* uav[1] = {0};
+        ID3DShaderResourceView* srv[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
         // ID3D11ShaderResourceView* new_srv[2]={rt_ssao_temp1->pTexture->m_pSRView,rt_ssao_temp2->pTexture->m_pSRView};
         // HW.pContext->CSSetShaderResources( 0, 2, new_srv );
         HW.get_context(CHW::IMM_CTX_ID)->CSSetUnorderedAccessViews(0, 1, &rt_ssao_temp->pUAView, &UAVInitialCounts); // TODO: id