ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed issue when async instance upload is not supported

Browse Source
This commit is contained in:
Elderme
2016-01-29 22:11:31 +01:00
parent 1ba19948f6
commit 0c85dd2e2e
2 changed files with 40 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/graphics/command_buffer.cpp
View File

@@ -85,13 +85,15 @@ void CommandBuffer<N>::clearMeshes()
}
template<int N>
void CommandBuffer<N>::unmapBuffers()
void CommandBuffer<N>::mapIndirectBuffer()
{
if (!CVS->supportsAsyncInstanceUpload())
{
glUnmapBuffer(GL_ARRAY_BUFFER);
glUnmapBuffer(GL_DRAW_INDIRECT_BUFFER);
}
glBindBuffer(GL_DRAW_INDIRECT_BUFFER,
m_draw_indirect_cmd_id);
m_draw_indirect_cmd = (DrawElementsIndirectCommand*)
glMapBufferRange(GL_DRAW_INDIRECT_BUFFER, 0,
10000 * sizeof(DrawElementsIndirectCommand),
GL_MAP_WRITE_BIT | GL_MAP_UNSYNCHRONIZED_BIT | GL_MAP_INVALIDATE_BUFFER_BIT);
}
template<int N>
@@ -132,6 +134,9 @@ void SolidCommandBuffer::fill(MeshMap *mesh_map)
{
clearMeshes();
if(!CVS->supportsAsyncInstanceUpload())
mapIndirectBuffer();
std::vector<int> dual_tex_material_list =
createVector<int>(Material::SHADERTYPE_SOLID,
Material::SHADERTYPE_ALPHA_TEST,
@@ -142,7 +147,7 @@ void SolidCommandBuffer::fill(MeshMap *mesh_map)
fillInstanceData<InstanceDataDualTex>(mesh_map,
dual_tex_material_list,
InstanceTypeDualTex);
std::vector<int> three_tex_material_list =
createVector<int>(Material::SHADERTYPE_DETAIL_MAP,
Material::SHADERTYPE_NORMAL_MAP);
@@ -152,8 +157,8 @@ void SolidCommandBuffer::fill(MeshMap *mesh_map)
InstanceTypeThreeTex);
unmapBuffers();
if (!CVS->supportsAsyncInstanceUpload())
glUnmapBuffer(GL_DRAW_INDIRECT_BUFFER);
} //SolidCommandBuffer::fill
@@ -165,6 +170,9 @@ void ShadowCommandBuffer::fill(MeshMap *mesh_map)
{
clearMeshes();
if(!CVS->supportsAsyncInstanceUpload())
mapIndirectBuffer();
std::vector<int> shadow_tex_material_list;
for(int cascade=0; cascade<4; cascade++)
{
@@ -188,7 +196,8 @@ void ShadowCommandBuffer::fill(MeshMap *mesh_map)
fillInstanceData<InstanceDataSingleTex>(mesh_map, shadow_tex_material_list, InstanceTypeShadow);
unmapBuffers();
if (!CVS->supportsAsyncInstanceUpload())
glUnmapBuffer(GL_DRAW_INDIRECT_BUFFER);
} //ShadowCommandBuffer::fill
@@ -201,6 +210,9 @@ void ReflectiveShadowMapCommandBuffer::fill(MeshMap *mesh_map)
{
clearMeshes();
if(!CVS->supportsAsyncInstanceUpload())
mapIndirectBuffer();
std::vector<int> rsm_material_list =
createVector<int>(Material::SHADERTYPE_SOLID,
Material::SHADERTYPE_ALPHA_TEST,
@@ -212,8 +224,9 @@ void ReflectiveShadowMapCommandBuffer::fill(MeshMap *mesh_map)
rsm_material_list,
InstanceTypeRSM);
unmapBuffers();
if (!CVS->supportsAsyncInstanceUpload())
glUnmapBuffer(GL_DRAW_INDIRECT_BUFFER);
} //ReflectiveShadowMapCommandBuffer::fill
GlowCommandBuffer::GlowCommandBuffer()
@@ -223,8 +236,14 @@ GlowCommandBuffer::GlowCommandBuffer()
void GlowCommandBuffer::fill(MeshMap *mesh_map)
{
clearMeshes();
if(!CVS->supportsAsyncInstanceUpload())
mapIndirectBuffer();
fillInstanceData<GlowInstanceData>(mesh_map,
createVector<int>(0),
InstanceTypeGlow);
unmapBuffers();
if (!CVS->supportsAsyncInstanceUpload())
glUnmapBuffer(GL_DRAW_INDIRECT_BUFFER);
} //GlowCommandBuffer::fill

18
src/graphics/command_buffer.hpp
View File

@@ -164,7 +164,7 @@ protected:
size_t m_command_buffer_offset;
void clearMeshes();
void unmapBuffers();
void mapIndirectBuffer();
// ------------------------------------------------------------------------
/** Send in VRAM all meshes associated with same material
@@ -205,7 +205,7 @@ protected:
void fillInstanceData(MeshMap *mesh_map,
const std::vector<int> &material_list,
InstanceType instance_type)
{
{
InstanceData *instance_buffer;
if (CVS->supportsAsyncInstanceUpload())
@@ -221,14 +221,6 @@ protected:
glMapBufferRange(GL_ARRAY_BUFFER, 0,
10000 * sizeof(InstanceDataDualTex),
GL_MAP_WRITE_BIT | GL_MAP_UNSYNCHRONIZED_BIT | GL_MAP_INVALIDATE_BUFFER_BIT);
glBindBuffer(GL_DRAW_INDIRECT_BUFFER,
m_draw_indirect_cmd_id);
m_draw_indirect_cmd = (DrawElementsIndirectCommand*)
glMapBufferRange(GL_DRAW_INDIRECT_BUFFER, 0,
10000 * sizeof(DrawElementsIndirectCommand),
GL_MAP_WRITE_BIT | GL_MAP_UNSYNCHRONIZED_BIT | GL_MAP_INVALIDATE_BUFFER_BIT);
}
for(int material_id: material_list)
@@ -237,6 +229,12 @@ protected:
mesh_map,
instance_buffer);
}
if (!CVS->supportsAsyncInstanceUpload())
{
glUnmapBuffer(GL_ARRAY_BUFFER);
}
}
public: