abian/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Avoids scoped binding of the already bound backend buffer.

Browse Source 
This was SVN commit r26831.
This commit is contained in:
Vladislav Belov 2022-04-26 18:25:52 +00:00
parent 98c18425a8
commit b26aa5936d
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source/renderer/backend/gl/DeviceCommandContext.cpp
View File

@ -149,7 +149,10 @@ CDeviceCommandContext::CDeviceCommandContext(CDevice* device)
glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, 0);
for (std::pair<GLenum, GLuint>& unit : m_BoundTextures)
unit.first = unit.second = 0;
{
unit.first = GL_TEXTURE_2D;
unit.second = 0;
}
for (size_t index = 0; index < m_VertexAttributeFormat.size(); ++index)
{
m_VertexAttributeFormat[index].active = false;
@ -976,11 +979,23 @@ CDeviceCommandContext::ScopedBufferBind::ScopedBufferBind(
m_CacheIndex = static_cast<size_t>(buffer->GetType());
const GLenum target = BufferTypeToGLTarget(buffer->GetType());
const GLuint handle = buffer->GetHandle();
if (m_DeviceCommandContext->m_BoundBuffers[m_CacheIndex].first == target &&
m_DeviceCommandContext->m_BoundBuffers[m_CacheIndex].second == handle)
{
// Use an invalid index as a sign that we don't need to restore the
// bound buffer.
m_CacheIndex = m_DeviceCommandContext->m_BoundBuffers.size();
}
else
{
glBindBufferARB(target, handle);
}
}
CDeviceCommandContext::ScopedBufferBind::~ScopedBufferBind()
{
if (m_CacheIndex >= m_DeviceCommandContext->m_BoundBuffers.size())
return;
glBindBufferARB(
m_DeviceCommandContext->m_BoundBuffers[m_CacheIndex].first,
m_DeviceCommandContext->m_BoundBuffers[m_CacheIndex].second);