piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

OGL: Use a fixed VAO for attributeless rendering.

Browse Source 
Instead of abusing whatever VAO is previously bound, which might have
enabled arrays.

Only used in one instance currently, which fixes a crash with older
NVIDIA drivers.
This commit is contained in:
Unknown W. Brackets 2014-12-03 23:24:58 -08:00
parent f7a16eca84
commit b19cff8a08
4 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Source/Core/VideoBackends/OGL/GLUtil.cpp
View File

@ -16,6 +16,8 @@
#include "VideoCommon/VideoConfig.h" #include "VideoCommon/VideoConfig.h"
cInterfaceBase *GLInterface; cInterfaceBase *GLInterface;
static GLuint attributelessVAO = 0;
static GLuint attributelessVBO = 0;
namespace OGL namespace OGL
{ {
@ -113,3 +115,32 @@ GLuint OpenGL_CompileProgram(const char* vertexShader, const char* fragmentShade
return programID; return programID;
} }
static void CreateAttributelessVAO()
{
glGenVertexArrays(1, &attributelessVAO);
// In a compatibility context, we require a valid, bound array buffer.
glGenBuffers(1, &attributelessVBO);
// Initialize the buffer with nothing.
glBindBuffer(GL_ARRAY_BUFFER, attributelessVBO);
glBufferData(GL_ARRAY_BUFFER, sizeof(GLfloat), nullptr, GL_STATIC_DRAW);
// We must also define vertex attribute 0.
glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 0, nullptr);
}
void OpenGL_BindAttributelessVAO()
{
if (attributelessVAO == 0)
CreateAttributelessVAO();
glBindVertexArray(attributelessVAO);
glBindBuffer(GL_ARRAY_BUFFER, attributelessVBO);
}
void OpenGL_DeleteAttributelessVAO()
{
glDeleteVertexArrays(1, &attributelessVAO);
glDeleteBuffers(1, &attributelessVBO);
}

5
Source/Core/VideoBackends/OGL/GLUtil.h
View File

@ -18,6 +18,11 @@ void InitInterface();
// Helpers // Helpers
GLuint OpenGL_CompileProgram(const char *vertexShader, const char *fragmentShader); GLuint OpenGL_CompileProgram(const char *vertexShader, const char *fragmentShader);
// Binds (and creates, if necessary) a VAO and VBO suitable for attributeless rendering.
void OpenGL_BindAttributelessVAO();
// Deletes any existing VAO / VBO that has been created.
void OpenGL_DeleteAttributelessVAO();
// this should be removed in future, but as long as glsl is unstable, we should really read this messages // this should be removed in future, but as long as glsl is unstable, we should really read this messages
#if defined(_DEBUG) || defined(DEBUGFAST) #if defined(_DEBUG) || defined(DEBUGFAST)
#define DEBUG_GLSL 1 #define DEBUG_GLSL 1

2
Source/Core/VideoBackends/OGL/PostProcessing.cpp
View File

@ -72,6 +72,8 @@ void OpenGLPostProcessing::BlitFromTexture(TargetRectangle src, TargetRectangle
if (m_attribute_workaround) if (m_attribute_workaround)
glBindVertexArray(m_attribute_vao); glBindVertexArray(m_attribute_vao);
else
OpenGL_BindAttributelessVAO();
m_shader.Bind(); m_shader.Bind();

2
Source/Core/VideoBackends/OGL/Render.cpp
View File

@ -686,6 +686,8 @@ void Renderer::Shutdown()
delete m_post_processor; delete m_post_processor;
m_post_processor = nullptr; m_post_processor = nullptr;
OpenGL_DeleteAttributelessVAO();
} }
void Renderer::Init() void Renderer::Init()