Updated core & tools (implemented raw buffers plus other improvements)

1 files changed, 35 insertions, 29 deletions

diff --git a/Tests/TestApp/assets/LuaTest.lua b/Tests/TestApp/assets/LuaTest.lua
index e0d2efb..eb79cd5 100644
--- a/Tests/TestApp/assets/LuaTest.lua
+++ b/Tests/TestApp/assets/LuaTest.lua
@@ -373,7 +373,7 @@ TestBuffer = Buffer.Create(
 		BindFlags = {"BIND_VERTEX_BUFFER", "BIND_SHADER_RESOURCE"},
 		uiSizeInBytes = 64,
 		Mode = "BUFFER_MODE_FORMATTED",
-		Format = {ValueType = "VT_FLOAT32", NumComponents = 1, IsNormalized = false},
+        ElementByteStride = 4
 	},
 	"VT_FLOAT32",
 	{1,2,3,4,5,6,7,8, 9,10,11,12,13,14,15,16}
@@ -383,9 +383,21 @@ assert(TestBuffer.Usage == "USAGE_DEFAULT")
 assert(TestBuffer.BindFlags[1] == "BIND_VERTEX_BUFFER" and TestBuffer.BindFlags[2] == "BIND_SHADER_RESOURCE" or
 	   TestBuffer.BindFlags[2] == "BIND_VERTEX_BUFFER" and TestBuffer.BindFlags[1] == "BIND_SHADER_RESOURCE")
 assert(TestBuffer.Mode == "BUFFER_MODE_FORMATTED")
-assert(TestBuffer.Format.ValueType == "VT_FLOAT32" )
-assert(TestBuffer.Format.NumComponents == 1 )
-assert(TestBuffer.Format.IsNormalized == false )
+
+TestBufferSRV = TestBuffer:CreateView{
+	Name = "TestBuffer SRV",
+	ViewType = "BUFFER_VIEW_SHADER_RESOURCE",
+	ByteOffset = 16,
+	ByteWidth = 32,
+    Format = {ValueType = "VT_FLOAT32", NumComponents = 1, IsNormalized = false}
+}
+
+assert(TestBufferSRV.ViewType == "BUFFER_VIEW_SHADER_RESOURCE" )
+assert(TestBufferSRV.ByteOffset == 16)
+assert(TestBufferSRV.ByteWidth == 32)
+assert(TestBufferSRV.Format.ValueType == "VT_FLOAT32" )
+assert(TestBufferSRV.Format.NumComponents == 1 )
+assert(TestBufferSRV.Format.IsNormalized == false )
 
 
 function TestBufferArg (Buffer)
@@ -416,7 +428,7 @@ TestBuffer3 = Buffer.Create(
 		BindFlags = {"BIND_VERTEX_BUFFER", "BIND_SHADER_RESOURCE"},
 		uiSizeInBytes = 64,
 		Mode = "BUFFER_MODE_FORMATTED",
-		Format = {ValueType = "VT_FLOAT32", NumComponents = 1, IsNormalized = false},
+        ElementByteStride = 4
 	}
 )
 
@@ -425,33 +437,33 @@ Context.SetVertexBuffers(1, TestBuffer, 0, nil)
 Context.SetVertexBuffers(nil, nil, nil, {"SET_VERTEX_BUFFERS_FLAG_RESET", "SET_VERTEX_BUFFERS_FLAG_RESET"})
 
 TestBuffer3 = Buffer.Create({
-	BindFlags = {"BIND_VERTEX_BUFFER", "BIND_UNORDERED_ACCESS"},
-	Mode = "BUFFER_MODE_FORMATTED",
-	Format = {ValueType = "VT_FLOAT32", NumComponents = 4, IsNormalized = false},
+    Name = "Test Buffer 3",
+	BindFlags = {"BIND_VERTEX_BUFFER", "BIND_UNORDERED_ACCESS", "BIND_SHADER_RESOURCE"},
+	Mode = "BUFFER_MODE_RAW",
 	uiSizeInBytes = (4+4) * 4 * 4,
 	ElementByteStride = 4 * 4
 })
-assert( TestBuffer3.Mode == "BUFFER_MODE_FORMATTED" )
-assert( TestBuffer3.Format.ValueType == "VT_FLOAT32" )
-assert( TestBuffer3.Format.NumComponents == 4 )
-assert( TestBuffer3.Format.IsNormalized == false )
+assert( TestBuffer3.Mode == "BUFFER_MODE_RAW" )
 
-Buff3DefaultUAV = TestBuffer3:GetDefaultView("BUFFER_VIEW_UNORDERED_ACCESS")
-assert(Buff3DefaultUAV.ViewType == "BUFFER_VIEW_UNORDERED_ACCESS" )
-assert(Buff3DefaultUAV.ByteOffset == 0 )
-assert(Buff3DefaultUAV.ByteWidth == TestBuffer3.uiSizeInBytes )
+TestBuffer3SRV = TestBuffer3:CreateView{
+	Name = "TestBuffer3 SRV",
+	ViewType = "BUFFER_VIEW_SHADER_RESOURCE",
+	ByteOffset = 16,
+	ByteWidth = 32
+}
+assert(TestBuffer3SRV.ViewType == "BUFFER_VIEW_SHADER_RESOURCE" )
+assert(TestBuffer3SRV.ByteOffset == 16)
+assert(TestBuffer3SRV.ByteWidth == 32)
 
 Buff3UAV = TestBuffer3:CreateView{
-	Name = "Buff3UAV",
+	Name = "TestBuffer3 UAV",
 	ViewType = "BUFFER_VIEW_UNORDERED_ACCESS",
-	ByteOffset = 0,
-	ByteWidth = TestBuffer3.ElementByteStride * 2
+	ByteOffset = 16
 }
+assert(Buff3UAV.ViewType == "BUFFER_VIEW_UNORDERED_ACCESS" )
+assert(Buff3UAV.ByteOffset == 16 )
+assert(Buff3UAV.ByteWidth == TestBuffer3.uiSizeInBytes - Buff3UAV.ByteOffset)
 
-assert(Buff3UAV.Name == "Buff3UAV")
-assert(Buff3UAV.ViewType == "BUFFER_VIEW_UNORDERED_ACCESS")
-assert(Buff3UAV.ByteOffset == 0)
-assert(Buff3UAV.ByteWidth == TestBuffer3.ElementByteStride * 2)
 
 function TestBufferViewArg(BuffViewArg)
 	assert( BuffViewArg.Name == "TestGlobalBuff2UAV" )
@@ -599,7 +611,6 @@ TestDrawAttribs = DrawAttribs.Create{
 	IndexType = "VT_UINT16",
 	IsIndexed = true,
 	NumInstances = 32,
-	IsIndirect = true,
 	BaseVertex = 48,
 	IndirectDrawArgsOffset = 1024,
 	StartVertexLocation = 64,
@@ -610,7 +621,6 @@ assert( TestDrawAttribs.NumIndices == 128 )
 assert( TestDrawAttribs.IndexType == "VT_UINT16" )
 assert( TestDrawAttribs.IsIndexed == true )
 assert( TestDrawAttribs.NumInstances == 32 )
-assert( TestDrawAttribs.IsIndirect == true )
 assert( TestDrawAttribs.BaseVertex == 48 )
 assert( TestDrawAttribs.IndirectDrawArgsOffset == 1024 )
 assert( TestDrawAttribs.StartVertexLocation == 64 )
@@ -622,7 +632,6 @@ TestDrawAttribs.NumVertices = 92
 TestDrawAttribs.IndexType = "VT_UINT32"
 TestDrawAttribs.IsIndexed = false
 TestDrawAttribs.NumInstances = 19
-TestDrawAttribs.IsIndirect = false
 TestDrawAttribs.BaseVertex = 498
 TestDrawAttribs.IndirectDrawArgsOffset = 234
 TestDrawAttribs.FirstIndexLocation = 264
@@ -639,7 +648,6 @@ assert( TestDrawAttribs.NumVertices == 92 )
 assert( TestDrawAttribs.IndexType == "VT_UINT32" )
 assert( TestDrawAttribs.IsIndexed == false )
 assert( TestDrawAttribs.NumInstances == 19 )
-assert( TestDrawAttribs.IsIndirect == false )
 assert( TestDrawAttribs.BaseVertex == 498 )
 assert( TestDrawAttribs.IndirectDrawArgsOffset == 234 )
 assert( TestDrawAttribs.FirstIndexLocation == 264 )
@@ -653,7 +661,6 @@ assert( TestGlobalDrawAttribs.NumIndices == 123 );
 assert( TestGlobalDrawAttribs.IndexType == "VT_UINT16" );
 assert( TestGlobalDrawAttribs.IsIndexed == true );
 assert( TestGlobalDrawAttribs.NumInstances == 19 );
-assert( TestGlobalDrawAttribs.IsIndirect == true );
 assert( TestGlobalDrawAttribs.BaseVertex == 97 );
 assert( TestGlobalDrawAttribs.IndirectDrawArgsOffset == 120 );
 assert( TestGlobalDrawAttribs.StartVertexLocation == 98 );
@@ -665,7 +672,6 @@ function TestDrawAttribsArg(DrawAttrs)
 	assert( DrawAttrs.IndexType == "VT_UINT16" );
 	assert( DrawAttrs.IsIndexed == true );
 	assert( DrawAttrs.NumInstances == 139 );
-	assert( DrawAttrs.IsIndirect == true );
 	assert( DrawAttrs.BaseVertex == 937 );
 	assert( DrawAttrs.IndirectDrawArgsOffset == 1205 );
 	assert( DrawAttrs.StartVertexLocation == 198 );