misc change
This commit is contained in:
@@ -143,7 +143,7 @@ void JulietApplication::Init()
|
||||
BufferCreateInfo bufferCI = {};
|
||||
bufferCI.Size = 1024;
|
||||
bufferCI.Usage = BufferUsage::StructuredBuffer; // SRV for ResourceDescriptorHeap access
|
||||
ConstantBuffer = CreateGraphicsBuffer(GraphicsDevice, bufferCI);
|
||||
StructuredBuffer = CreateGraphicsBuffer(GraphicsDevice, bufferCI);
|
||||
|
||||
TransferBufferCreateInfo transferCI = {};
|
||||
transferCI.Size = 1024;
|
||||
@@ -151,7 +151,7 @@ void JulietApplication::Init()
|
||||
TransferBuffer = CreateGraphicsTransferBuffer(GraphicsDevice, transferCI);
|
||||
|
||||
// Upload Static Data for Test
|
||||
if (TransferBuffer && ConstantBuffer)
|
||||
if (TransferBuffer && StructuredBuffer)
|
||||
{
|
||||
void* data = MapGraphicsTransferBuffer(GraphicsDevice, TransferBuffer);
|
||||
if (data)
|
||||
@@ -165,8 +165,8 @@ void JulietApplication::Init()
|
||||
UnmapGraphicsTransferBuffer(GraphicsDevice, TransferBuffer);
|
||||
|
||||
CommandList* initCmd = AcquireCommandList(GraphicsDevice);
|
||||
CopyBuffer(initCmd, ConstantBuffer, TransferBuffer, 256);
|
||||
TransitionBufferToReadable(initCmd, ConstantBuffer);
|
||||
CopyBuffer(initCmd, StructuredBuffer, TransferBuffer, 256);
|
||||
TransitionBufferToReadable(initCmd, StructuredBuffer);
|
||||
SubmitCommandLists(initCmd);
|
||||
}
|
||||
}
|
||||
@@ -220,9 +220,9 @@ void JulietApplication::Shutdown()
|
||||
{
|
||||
DestroyGraphicsPipeline(GraphicsDevice, GraphicsPipeline);
|
||||
}
|
||||
if (ConstantBuffer)
|
||||
if (StructuredBuffer)
|
||||
{
|
||||
DestroyGraphicsBuffer(GraphicsDevice, ConstantBuffer);
|
||||
DestroyGraphicsBuffer(GraphicsDevice, StructuredBuffer);
|
||||
}
|
||||
if (TransferBuffer)
|
||||
{
|
||||
@@ -366,7 +366,7 @@ void JulietApplication::OnPreRender(CommandList* cmd)
|
||||
index_t index = 0;
|
||||
|
||||
// Buffer uploads
|
||||
if (ConstantBuffer && TransferBuffer)
|
||||
if (StructuredBuffer && TransferBuffer)
|
||||
{
|
||||
void* ptr = MapGraphicsTransferBuffer(GraphicsDevice, TransferBuffer);
|
||||
if (ptr)
|
||||
@@ -405,8 +405,8 @@ void JulietApplication::OnPreRender(CommandList* cmd)
|
||||
UnmapGraphicsTransferBuffer(GraphicsDevice, TransferBuffer);
|
||||
}
|
||||
|
||||
CopyBuffer(cmd, ConstantBuffer, TransferBuffer, CubeMesh->IndexByteOffset + (CubeMesh->IndexCount * sizeof(uint16)));
|
||||
TransitionBufferToReadable(cmd, ConstantBuffer);
|
||||
CopyBuffer(cmd, StructuredBuffer, TransferBuffer, CubeMesh->IndexByteOffset + (CubeMesh->IndexCount * sizeof(uint16)));
|
||||
TransitionBufferToReadable(cmd, StructuredBuffer);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -414,7 +414,7 @@ void JulietApplication::OnRender(RenderPass* pass, CommandList* cmd)
|
||||
{
|
||||
BindGraphicsPipeline(pass, GraphicsPipeline);
|
||||
|
||||
uint32 descriptorIndex = GetDescriptorIndex(GraphicsDevice, ConstantBuffer);
|
||||
uint32 descriptorIndex = GetDescriptorIndex(GraphicsDevice, StructuredBuffer);
|
||||
|
||||
struct PushData
|
||||
{
|
||||
@@ -426,7 +426,7 @@ void JulietApplication::OnRender(RenderPass* pass, CommandList* cmd)
|
||||
|
||||
SetPushConstants(cmd, ShaderStage::Vertex, 0, sizeof(pushData) / 4, &pushData);
|
||||
|
||||
SetIndexBuffer(cmd, ConstantBuffer, IndexFormat::UInt16, CubeMesh->IndexCount, CubeMesh->IndexByteOffset);
|
||||
SetIndexBuffer(cmd, StructuredBuffer, IndexFormat::UInt16, CubeMesh->IndexCount, CubeMesh->IndexByteOffset);
|
||||
// DrawIndexedPrimitives(pass, static_cast<uint32>(CubeMesh->IndexCount), 1, 0, 0, 0);
|
||||
|
||||
DrawIndexedPrimitives(pass, static_cast<uint32>(CubeMesh->IndexCount), 1,
|
||||
|
||||
Reference in New Issue
Block a user