From 57b27983564952bee0100dcce350361aa32c9494 Mon Sep 17 00:00:00 2001
From: Egor Yusov <egor.yusov@gmail.com>
Date: Sun, 26 Aug 2018 17:09:03 -0700
Subject: Updated core & tools (implemented raw buffers plus other
 improvements)

---
 Tests/TestApp/src/TestShaderResourceLayout.cpp | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

(limited to 'Tests/TestApp/src/TestShaderResourceLayout.cpp')

diff --git a/Tests/TestApp/src/TestShaderResourceLayout.cpp b/Tests/TestApp/src/TestShaderResourceLayout.cpp
index 2dc1cc6..9f00495 100644
--- a/Tests/TestApp/src/TestShaderResourceLayout.cpp
+++ b/Tests/TestApp/src/TestShaderResourceLayout.cpp
@@ -111,24 +111,32 @@ TestShaderResourceLayout::TestShaderResourceLayout( IRenderDevice *pDevice, IDev
     }
 
     RefCntAutoPtr<IBuffer> pUniformTexelBuff, pStorageTexelBuff;
-    IBufferView *pUniformTexelBuffSRV = nullptr, *pStorageTexelBuffUAV = nullptr;
+    RefCntAutoPtr<IBufferView> pUniformTexelBuffSRV , pStorageTexelBuffUAV;
     {
-        Diligent::BufferDesc TxlBuffDesc;
+        BufferDesc TxlBuffDesc;
         TxlBuffDesc.Name = "Uniform texel buffer test";
         TxlBuffDesc.uiSizeInBytes = 256;
-        TxlBuffDesc.BindFlags = BIND_SHADER_RESOURCE;
+        TxlBuffDesc.BindFlags = BIND_SHADER_RESOURCE | BIND_UNORDERED_ACCESS;
         TxlBuffDesc.Usage = USAGE_DEFAULT;
-        TxlBuffDesc.Format.ValueType = VT_FLOAT32;
-        TxlBuffDesc.Format.NumComponents = 4;
-        TxlBuffDesc.Format.IsNormalized = false;
+        TxlBuffDesc.ElementByteStride = 16;
         TxlBuffDesc.Mode = BUFFER_MODE_FORMATTED;
         pDevice->CreateBuffer(TxlBuffDesc, BufferData{}, &pUniformTexelBuff);
-        pUniformTexelBuffSRV = pUniformTexelBuff->GetDefaultView(BUFFER_VIEW_SHADER_RESOURCE);
+
+        BufferViewDesc TxlBuffViewDesc;
+        TxlBuffViewDesc.Name = "Uniform texel buffer SRV";
+        TxlBuffViewDesc.ViewType = BUFFER_VIEW_SHADER_RESOURCE;
+        TxlBuffViewDesc.Format.ValueType = VT_FLOAT32;
+        TxlBuffViewDesc.Format.NumComponents = 4;
+        TxlBuffViewDesc.Format.IsNormalized = false;
+        pUniformTexelBuff->CreateView(TxlBuffViewDesc, &pUniformTexelBuffSRV);
 
         TxlBuffDesc.Name = "Storage texel buffer test";
         TxlBuffDesc.BindFlags = BIND_UNORDERED_ACCESS;
         pDevice->CreateBuffer(TxlBuffDesc, BufferData{}, &pStorageTexelBuff);
-        pStorageTexelBuffUAV = pStorageTexelBuff->GetDefaultView(BUFFER_VIEW_UNORDERED_ACCESS);
+        
+        TxlBuffViewDesc.Name = "Storage texel buffer UAV";
+        TxlBuffViewDesc.ViewType = BUFFER_VIEW_UNORDERED_ACCESS;
+        pUniformTexelBuff->CreateView(TxlBuffViewDesc, &pStorageTexelBuffUAV);
     }
     
     ResourceMappingDesc ResMappingDesc;
-- 
cgit v1.2.3