ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GLUtil: Drop now-unused attributeless VAO helpers

This commit is contained in:
Stenzek 2018-02-09 21:01:47 +10:00
parent 052d78bcb1
commit aaea515d71
3 changed files with 3 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
Source/Core/Common/GL/GLUtil.cpp
View File

@ -10,8 +10,6 @@
#include "Common/Logging/Log.h" #include "Common/Logging/Log.h"
std::unique_ptr<cInterfaceBase> GLInterface; std::unique_ptr<cInterfaceBase> GLInterface;
static GLuint attributelessVAO = 0;
static GLuint attributelessVBO = 0;
void InitInterface() void InitInterface()
{ {
@ -29,7 +27,7 @@ GLuint OpenGL_CompileProgram(const std::string& vertexShader, const std::string&
const char* shader = vertexShader.c_str(); const char* shader = vertexShader.c_str();
glShaderSource(vertexShaderID, 1, &shader, nullptr); glShaderSource(vertexShaderID, 1, &shader, nullptr);
glCompileShader(vertexShaderID); glCompileShader(vertexShaderID);
#if defined(_DEBUG) || defined(DEBUGFAST) || defined(DEBUG_GLSL) #if defined(_DEBUG) || defined(DEBUGFAST)
GLint Result = GL_FALSE; GLint Result = GL_FALSE;
char stringBuffer[1024]; char stringBuffer[1024];
GLsizei stringBufferUsage = 0; GLsizei stringBufferUsage = 0;
@ -56,7 +54,7 @@ GLuint OpenGL_CompileProgram(const std::string& vertexShader, const std::string&
shader = fragmentShader.c_str(); shader = fragmentShader.c_str();
glShaderSource(fragmentShaderID, 1, &shader, nullptr); glShaderSource(fragmentShaderID, 1, &shader, nullptr);
glCompileShader(fragmentShaderID); glCompileShader(fragmentShaderID);
#if defined(_DEBUG) || defined(DEBUGFAST) || defined(DEBUG_GLSL) #if defined(_DEBUG) || defined(DEBUGFAST)
glGetShaderiv(fragmentShaderID, GL_COMPILE_STATUS, &Result); glGetShaderiv(fragmentShaderID, GL_COMPILE_STATUS, &Result);
glGetShaderInfoLog(fragmentShaderID, 1024, &stringBufferUsage, stringBuffer); glGetShaderInfoLog(fragmentShaderID, 1024, &stringBufferUsage, stringBuffer);
@ -80,7 +78,7 @@ GLuint OpenGL_CompileProgram(const std::string& vertexShader, const std::string&
glAttachShader(programID, vertexShaderID); glAttachShader(programID, vertexShaderID);
glAttachShader(programID, fragmentShaderID); glAttachShader(programID, fragmentShaderID);
glLinkProgram(programID); glLinkProgram(programID);
#if defined(_DEBUG) || defined(DEBUGFAST) || defined(DEBUG_GLSL) #if defined(_DEBUG) || defined(DEBUGFAST)
glGetProgramiv(programID, GL_LINK_STATUS, &Result); glGetProgramiv(programID, GL_LINK_STATUS, &Result);
glGetProgramInfoLog(programID, 1024, &stringBufferUsage, stringBuffer); glGetProgramInfoLog(programID, 1024, &stringBufferUsage, stringBuffer);
@ -102,45 +100,3 @@ GLuint OpenGL_CompileProgram(const std::string& vertexShader, const std::string&
return programID; return programID;
} }
void OpenGL_CreateAttributelessVAO()
{
glGenVertexArrays(1, &attributelessVAO);
_dbg_assert_msg_(VIDEO, attributelessVAO != 0,
"Attributeless VAO should have been created successfully.")
// In a compatibility context, we require a valid, bound array buffer.
glGenBuffers(1, &attributelessVBO);
_dbg_assert_msg_(VIDEO, attributelessVBO != 0,
"Attributeless VBO should have been created successfully.")
// Initialize the buffer with nothing. 16 floats is an arbitrary size that may work around
// driver issues.
glBindBuffer(GL_ARRAY_BUFFER, attributelessVBO);
glBufferData(GL_ARRAY_BUFFER, sizeof(GLfloat) * 16, nullptr, GL_STATIC_DRAW);
// We must also define vertex attribute 0.
glBindVertexArray(attributelessVAO);
glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 0, nullptr);
glEnableVertexAttribArray(0);
}
void OpenGL_BindAttributelessVAO()
{
_dbg_assert_msg_(VIDEO, attributelessVAO != 0,
"Attributeless VAO should have already been created.")
glBindVertexArray(attributelessVAO);
}
void OpenGL_DeleteAttributelessVAO()
{
_dbg_assert_msg_(VIDEO, attributelessVAO != 0,
"Attributeless VAO should have already been created.") if (attributelessVAO != 0)
{
glDeleteVertexArrays(1, &attributelessVAO);
glDeleteBuffers(1, &attributelessVBO);
attributelessVAO = 0;
attributelessVBO = 0;
}
}

16
Source/Core/Common/GL/GLUtil.h
View File

@ -17,19 +17,3 @@ void InitInterface();
// Helpers // Helpers
GLuint OpenGL_CompileProgram(const std::string& vertexShader, const std::string& fragmentShader); GLuint OpenGL_CompileProgram(const std::string& vertexShader, const std::string& fragmentShader);
// Creates and deletes a VAO and VBO suitable for attributeless rendering.
// Called by the Renderer.
void OpenGL_CreateAttributelessVAO();
void OpenGL_DeleteAttributelessVAO();
// Binds the VAO suitable for attributeless rendering.
void OpenGL_BindAttributelessVAO();
// this should be removed in future, but as long as glsl is unstable, we should really read this
// messages
#if defined(_DEBUG) || defined(DEBUGFAST)
#define DEBUG_GLSL 1
#else
#define DEBUG_GLSL 0
#endif

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

@ -816,8 +816,6 @@ void Renderer::Shutdown()
s_raster_font.reset(); s_raster_font.reset();
m_post_processor.reset(); m_post_processor.reset();
OpenGL_DeleteAttributelessVAO();
} }
void Renderer::Init() void Renderer::Init()
@ -828,8 +826,6 @@ void Renderer::Init()
m_post_processor = std::make_unique<OpenGLPostProcessing>(); m_post_processor = std::make_unique<OpenGLPostProcessing>();
s_raster_font = std::make_unique<RasterFont>(); s_raster_font = std::make_unique<RasterFont>();
OpenGL_CreateAttributelessVAO();
} }
std::unique_ptr<AbstractTexture> Renderer::CreateTexture(const TextureConfig& config) std::unique_ptr<AbstractTexture> Renderer::CreateTexture(const TextureConfig& config)