hyzboy/ULRE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moved few codes to RenderAssignBuffer.cpp from MaterialRenderList.cpp

Browse Source
This commit is contained in:
HuYingzhuo(hugo/hyzboy) 2023-09-06 16:24:05 +08:00
parent 8437d8d561
commit 202bff5870
4 changed files with 146 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/SceneGraph/CMakeLists.txt
View File

@ -45,6 +45,7 @@ SET(SCENE_GRAPH_HEADER ${SG_INCLUDE_PATH}/SceneInfo.h
SET(SCENE_GRAPH_SOURCE RenderList.cpp SET(SCENE_GRAPH_SOURCE RenderList.cpp
MaterialRenderList.cpp MaterialRenderList.cpp
RenderAssignBuffer.h RenderAssignBuffer.h
RenderAssignBuffer.cpp
SceneNode.cpp SceneNode.cpp
SceneOrient.cpp) SceneOrient.cpp)

13
src/SceneGraph/MaterialRenderList.cpp
View File

@ -3,7 +3,6 @@
#include<hgl/graph/VKDevice.h> #include<hgl/graph/VKDevice.h>
#include<hgl/graph/VKCommandBuffer.h> #include<hgl/graph/VKCommandBuffer.h>
#include<hgl/graph/VKVertexInput.h> #include<hgl/graph/VKVertexInput.h>
#include<hgl/graph/mtl/UBOCommon.h>
#include<hgl/util/sort/Sort.h> #include<hgl/util/sort/Sort.h>
#include"RenderAssignBuffer.h" #include"RenderAssignBuffer.h"
@ -177,15 +176,7 @@ void MaterialRenderList::Bind(MaterialInstance *mi)
{ {
if(!mi)return; if(!mi)return;
const VIL *vil=mi->GetVIL(); assign_buffer->Bind(mi);
const uint assign_binding_count=vil->GetCount(VertexInputGroup::Assign);
if(assign_binding_count>0)
{
mi->BindUBO(DescriptorSetType::PerFrame,mtl::SBS_LocalToWorld.name,assign_buffer->ubo_l2w);
// mi->BindUBO(DescriptorSetType::PerFrame,"Assign",assign_buffer->ubo_mi);
}
cmd_buf->BindDescriptorSets(mi->GetMaterial()); cmd_buf->BindDescriptorSets(mi->GetMaterial());
} }
@ -261,7 +252,7 @@ bool MaterialRenderList::Bind(const VertexInputData *vid,const uint ri_index)
if(assign_binding_count!=1) if(assign_binding_count!=1)
return(false); return(false);
vbo_list->Add(assign_buffer->vbo_assigns->GetBuffer(),ASSIGNS_VBO_STRIP_BYTES*ri_index); vbo_list->Add(assign_buffer->GetAssignVBO(),ASSIGNS_VBO_STRIP_BYTES*ri_index);
} }
} }

130
src/SceneGraph/RenderAssignBuffer.cpp Normal file
View File

@ -0,0 +1,130 @@
#include"RenderAssignBuffer.h"
#include<hgl/graph/VKVertexAttribBuffer.h>
#include<hgl/graph/VKDevice.h>
#include<hgl/graph/VKMaterialInstance.h>
#include<hgl/graph/RenderNode.h>
#include<hgl/graph/mtl/UBOCommon.h>
VK_NAMESPACE_BEGIN
VkBuffer RenderAssignBuffer::GetAssignVBO()const
{
return vbo_assigns->GetBuffer();
}
void RenderAssignBuffer::Bind(MaterialInstance *mi)const
{
const VIL *vil=mi->GetVIL();
const uint assign_binding_count=vil->GetCount(VertexInputGroup::Assign);
if(assign_binding_count<=0)return;
mi->BindUBO(DescriptorSetType::PerFrame,mtl::SBS_LocalToWorld.name,ubo_l2w);
// mi->BindUBO(DescriptorSetType::PerFrame,"Assign",assign_buffer->ubo_mi);
}
void RenderAssignBuffer::ClearNode()
{
SAFE_CLEAR(ubo_l2w);
SAFE_CLEAR(ubo_mi);
SAFE_CLEAR(vbo_assigns);
node_count=0;
}
void RenderAssignBuffer::Clear()
{
ClearNode();
// ClearMI();
// SAFE_CLEAR(bone_id)
// SAFE_CLEAR(bone_weight)
}
void RenderAssignBuffer::NodeAlloc(GPUDevice *dev,const uint c)
{
ClearNode();
node_count=power_to_2(c);
ubo_l2w=dev->CreateUBO(node_count*sizeof(Matrix4f));
//ubo_mi=dev->CreateUBO(node_count*sizeof(uint8));
vbo_assigns=dev->CreateVBO(VF_V1U16,node_count);
}
//void MIAlloc(GPUDevice *dev,const uint c,const uint mis)
//{
// ClearMI();
// if(c<=0||mi_size<=0)return;
//
// mi_count=power_to_2(c);
// mi_size=mis;
// mi_id=dev->CreateVBO(VF_V1U8,mi_count);
// mi_id_buffer=mi_id->GetBuffer();
// mi_data_buffer=dev->CreateUBO(mi_count*mi_size);
//}
void RenderAssignBuffer::WriteLocalToWorld(RenderNode *render_node,const uint count)
{
RenderNode *rn;
//new l2w array in ubo
{
Matrix4f *tp=(hgl::Matrix4f *)(ubo_l2w->Map());
uint16 *idp=(uint16 *)(vbo_assigns->Map());
rn=render_node;
for(uint i=0;i<count;i++)
{
*tp=rn->local_to_world;
++tp;
*idp=i;
++idp;
++rn;
}
vbo_assigns->Unmap();
ubo_l2w->Unmap();
}
}
//void WriteMaterialInstance(RenderNode *render_node,const uint count,const MaterialInstanceSets &mi_set)
//{
// //MaterialInstance ID
// {
// uint8 *tp=(uint8 *)(mi_id->Map());
// for(uint i=0;i<count;i++)
// {
// *tp=mi_set.Find(render_node->ri->GetMaterialInstance());
// ++tp;
// ++render_node;
// }
// mi_id->Unmap();
// }
// //MaterialInstance Data
// {
// //const uint count=mi_set.GetCount();
// //uint8 *tp=(uint8 *)(mi_data_buffer->Map());
// //const MaterialInstance **mi=mi_set.GetData();
// //for(uint i=0;i<count;i++)
// //{
// // memcpy(tp,(*mi)->GetData(),mi_size);
//
// // ++mi;
// // tp+=mi_size;
// //}
// //mi_data_buffer->Unmap();
// }
//}
VK_NAMESPACE_END

128
src/SceneGraph/RenderAssignBuffer.h
View File

@ -1,6 +1,5 @@
#pragma once #pragma once
//#include<hgl/graph/VK.h> #include<hgl/graph/VK.h>
#include<hgl/graph/VKVertexAttribBuffer.h>
VK_NAMESPACE_BEGIN VK_NAMESPACE_BEGIN
// ubo_range大致分为三档: // ubo_range大致分为三档:
@ -24,6 +23,9 @@ VK_NAMESPACE_BEGIN
constexpr const uint ASSIGNS_VBO_STRIP_BYTES=2; ///<Assign VBO的每个节点的字节数 constexpr const uint ASSIGNS_VBO_STRIP_BYTES=2; ///<Assign VBO的每个节点的字节数
struct RenderNode;
class MaterialInstance;
/* /*
* 渲染节点额外提供的数据 * 渲染节点额外提供的数据
*/ */
@ -52,125 +54,21 @@ struct RenderAssignBuffer
public: public:
RenderAssignBuffer() VkBuffer GetAssignVBO()const;
{
hgl_zero(*this);
}
~RenderAssignBuffer() void Bind(MaterialInstance *)const;
{
Clear();
}
void ClearNode() public:
{
SAFE_CLEAR(ubo_l2w);
SAFE_CLEAR(ubo_mi);
SAFE_CLEAR(vbo_assigns);
node_count=0; RenderAssignBuffer(){hgl_zero(*this);}
} ~RenderAssignBuffer(){Clear();}
//void ClearMI() void ClearNode();
//{
// SAFE_CLEAR(mi_id)
// SAFE_CLEAR(mi_data_buffer);
// mi_count=0;
// mi_size=0;
//}
void Clear() void Clear();
{
ClearNode();
// ClearMI();
// SAFE_CLEAR(bone_id) void NodeAlloc(GPUDevice *dev,const uint c);
// SAFE_CLEAR(bone_weight) void WriteLocalToWorld(RenderNode *render_node,const uint count);
}
void NodeAlloc(GPUDevice *dev,const uint c)
{
ClearNode();
node_count=power_to_2(c);
ubo_l2w=dev->CreateUBO(node_count*sizeof(Matrix4f));
//ubo_mi=dev->CreateUBO(node_count*sizeof(uint8));
vbo_assigns=dev->CreateVBO(VF_V1U16,node_count);
}
//void MIAlloc(GPUDevice *dev,const uint c,const uint mis)
//{
// ClearMI();
// if(c<=0||mi_size<=0)return;
//
// mi_count=power_to_2(c);
// mi_size=mis;
// mi_id=dev->CreateVBO(VF_V1U8,mi_count);
// mi_id_buffer=mi_id->GetBuffer();
// mi_data_buffer=dev->CreateUBO(mi_count*mi_size);
//}
void WriteLocalToWorld(RenderNode *render_node,const uint count)
{
RenderNode *rn;
//new l2w array in ubo
{
Matrix4f *tp=(hgl::Matrix4f *)(ubo_l2w->Map());
uint16 *idp=(uint16 *)(vbo_assigns->Map());
rn=render_node;
for(uint i=0;i<count;i++)
{
*tp=rn->local_to_world;
++tp;
*idp=i;
++idp;
++rn;
}
vbo_assigns->Unmap();
ubo_l2w->Unmap();
}
}
//void WriteMaterialInstance(RenderNode *render_node,const uint count,const MaterialInstanceSets &mi_set)
//{
// //MaterialInstance ID
// {
// uint8 *tp=(uint8 *)(mi_id->Map());
// for(uint i=0;i<count;i++)
// {
// *tp=mi_set.Find(render_node->ri->GetMaterialInstance());
// ++tp;
// ++render_node;
// }
// mi_id->Unmap();
// }
// //MaterialInstance Data
// {
// //const uint count=mi_set.GetCount();
// //uint8 *tp=(uint8 *)(mi_data_buffer->Map());
// //const MaterialInstance **mi=mi_set.GetData();
// //for(uint i=0;i<count;i++)
// //{
// // memcpy(tp,(*mi)->GetData(),mi_size);
//
// // ++mi;
// // tp+=mi_size;
// //}
// //mi_data_buffer->Unmap();
// }
//}
};//struct RenderAssignBuffer };//struct RenderAssignBuffer
VK_NAMESPACE_END VK_NAMESPACE_END