From 850410b1a3f8cc0465c944700cd76a49bbb0fdb7 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Wed, 3 Dec 2014 21:21:57 +0000
Subject: [PATCH] Vertex buffer functions also need to bind the VAO when
 reading

---
 .../driver/gl/wrappers/gl_buffer_funcs.cpp    | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/renderdoc/driver/gl/wrappers/gl_buffer_funcs.cpp b/renderdoc/driver/gl/wrappers/gl_buffer_funcs.cpp
index a2341027b..c77229ee7 100644
--- a/renderdoc/driver/gl/wrappers/gl_buffer_funcs.cpp
+++ b/renderdoc/driver/gl/wrappers/gl_buffer_funcs.cpp
@@ -2541,9 +2541,23 @@ bool WrappedOpenGL::Serialise_glBindVertexBuffer(GLuint bindingindex, GLuint buf
 	SERIALISE_ELEMENT(ResourceId, id, (buffer ? GetResourceManager()->GetID(BufferRes(GetCtx(), buffer)) : ResourceId()));
 	SERIALISE_ELEMENT(uint64_t, offs, offset);
 	SERIALISE_ELEMENT(uint64_t, str, stride);
+	SERIALISE_ELEMENT(ResourceId, vid, m_VertexArrayRecord ? m_VertexArrayRecord->GetResourceID() : ResourceId());
 
 	if(m_State <= EXECUTING)
 	{
+		if(m_State == READING)
+		{
+			if(vid != ResourceId())
+			{
+				GLResource res = GetResourceManager()->GetLiveResource(vid);
+				m_Real.glBindVertexArray(res.name);
+			}
+			else
+			{
+				m_Real.glBindVertexArray(m_FakeVAO);
+			}
+		}
+
 		GLuint live = 0;
 		if(id != ResourceId())
 			live = GetResourceManager()->GetLiveResource(id).name;
@@ -2583,6 +2597,7 @@ bool WrappedOpenGL::Serialise_glBindVertexBuffers(GLuint first, GLsizei count, c
 {
 	SERIALISE_ELEMENT(uint32_t, First, first);
 	SERIALISE_ELEMENT(int32_t, Count, count);
+	SERIALISE_ELEMENT(ResourceId, vid, m_VertexArrayRecord ? m_VertexArrayRecord->GetResourceID() : ResourceId());
 
 	GLuint *bufs = NULL;
 	GLintptr *offs = NULL;
@@ -2614,6 +2629,19 @@ bool WrappedOpenGL::Serialise_glBindVertexBuffers(GLuint first, GLsizei count, c
 
 	if(m_State <= EXECUTING)
 	{
+		if(m_State == READING)
+		{
+			if(vid != ResourceId())
+			{
+				GLResource res = GetResourceManager()->GetLiveResource(vid);
+				m_Real.glBindVertexArray(res.name);
+			}
+			else
+			{
+				m_Real.glBindVertexArray(m_FakeVAO);
+			}
+		}
+
 		m_Real.glBindVertexBuffers(First, Count, bufs, offs, str);
 
 		delete[] bufs;
@@ -2653,9 +2681,25 @@ bool WrappedOpenGL::Serialise_glVertexBindingDivisor(GLuint bindingindex, GLuint
 {
 	SERIALISE_ELEMENT(uint32_t, idx, bindingindex);
 	SERIALISE_ELEMENT(uint32_t, d, divisor);
+	SERIALISE_ELEMENT(ResourceId, vid, m_VertexArrayRecord ? m_VertexArrayRecord->GetResourceID() : ResourceId());
 
 	if(m_State <= EXECUTING)
+	{
+		if(m_State == READING)
+		{
+			if(vid != ResourceId())
+			{
+				GLResource res = GetResourceManager()->GetLiveResource(vid);
+				m_Real.glBindVertexArray(res.name);
+			}
+			else
+			{
+				m_Real.glBindVertexArray(m_FakeVAO);
+			}
+		}
+
 		m_Real.glVertexBindingDivisor(idx, d);
+	}
 
 	return true;
 }