Remove wrong commit

This commit is contained in:
Benau 2017-12-10 00:12:35 +08:00
parent f70af4677c
commit dc562103c5
3 changed files with 2 additions and 9 deletions

View File

@ -166,9 +166,6 @@ void SolidCommandBuffer::fill(MeshMap *mesh_map)
fillInstanceData<InstanceDataFourTex, MeshMap>
(mesh_map, four_tex_material_list, InstanceTypeFourTex);
/* glBindBuffer(GL_DRAW_INDIRECT_BUFFER, m_draw_indirect_cmd_id);
glFlushMappedBufferRange(GL_DRAW_INDIRECT_BUFFER, 0,10000 * 20);
glBindBuffer(GL_DRAW_INDIRECT_BUFFER,0);*/
if (!CVS->supportsAsyncInstanceUpload())
glUnmapBuffer(GL_DRAW_INDIRECT_BUFFER);
} //SolidCommandBuffer::fill

View File

@ -218,10 +218,6 @@ protected:
mesh_map,
instance_buffer);
}
/*glBindBuffer(GL_ARRAY_BUFFER,
VAOManager::getInstance()->getInstanceBuffer(instance_type));
glFlushMappedBufferRange(GL_ARRAY_BUFFER, 0,10000 * sizeof(InstanceDataThreeTex));
glBindBuffer(GL_ARRAY_BUFFER,0);*/
if (!CVS->supportsAsyncInstanceUpload())
{
glUnmapBuffer(GL_ARRAY_BUFFER);

View File

@ -721,8 +721,8 @@ void DrawCalls::prepareDrawCalls( ShadowMatrices& shadow_matrices,
solid_poly_count = m_solid_cmd_buffer->getPolyCount();
shadow_poly_count = m_shadow_cmd_buffer->getPolyCount();
//if (CVS->supportsAsyncInstanceUpload())
// glMemoryBarrier(GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT);
if (CVS->supportsAsyncInstanceUpload())
glMemoryBarrier(GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT);
#endif // !defined(USE_GLES2)
}