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

Merge pull request #11279 from tellowkrinkle/GlobalStateIsGreat 

VideoBackends:OGL: Creating vertex formats shouldn't unbind anything
This commit is contained in:
Pokechu22 2022-11-28 20:18:17 -08:00 committed by GitHub
parent 44f8b8c100 e3cc42069f
commit 421af09b1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,7 +59,6 @@ GLVertexFormat::GLVertexFormat(const PortableVertexDeclaration& vtx_decl)
glGenVertexArrays(1, &VAO); glGenVertexArrays(1, &VAO);
glBindVertexArray(VAO); glBindVertexArray(VAO);
ProgramShaderCache::BindVertexFormat(this);
// the element buffer is bound directly to the vao, so we must it set for every vao // the element buffer is bound directly to the vao, so we must it set for every vao
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, vm->GetIndexBufferHandle()); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, vm->GetIndexBufferHandle());
@ -77,6 +76,9 @@ GLVertexFormat::GLVertexFormat(const PortableVertexDeclaration& vtx_decl)
SetPointer(ShaderAttrib::TexCoord0 + i, vertex_stride, vtx_decl.texcoords[i]); SetPointer(ShaderAttrib::TexCoord0 + i, vertex_stride, vtx_decl.texcoords[i]);
SetPointer(ShaderAttrib::PositionMatrix, vertex_stride, vtx_decl.posmtx); SetPointer(ShaderAttrib::PositionMatrix, vertex_stride, vtx_decl.posmtx);
// Other code shouldn't have to worry about its vertex formats being randomly unbound
ProgramShaderCache::ReBindVertexFormat();
} }
GLVertexFormat::~GLVertexFormat() GLVertexFormat::~GLVertexFormat()

6
Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp
View File

@ -496,6 +496,12 @@ void ProgramShaderCache::BindVertexFormat(const GLVertexFormat* vertex_format)
s_last_VAO = new_VAO; s_last_VAO = new_VAO;
} }
void ProgramShaderCache::ReBindVertexFormat()
{
if (s_last_VAO)
glBindVertexArray(s_last_VAO);
}
bool ProgramShaderCache::IsValidVertexFormatBound() bool ProgramShaderCache::IsValidVertexFormatBound()
{ {
return s_last_VAO != 0 && s_last_VAO != s_attributeless_VAO; return s_last_VAO != 0 && s_last_VAO != s_attributeless_VAO;

1
Source/Core/VideoBackends/OGL/ProgramShaderCache.h
View File

@ -69,6 +69,7 @@ class ProgramShaderCache
{ {
public: public:
static void BindVertexFormat(const GLVertexFormat* vertex_format); static void BindVertexFormat(const GLVertexFormat* vertex_format);
static void ReBindVertexFormat();
static bool IsValidVertexFormatBound(); static bool IsValidVertexFormatBound();
static void InvalidateVertexFormat(); static void InvalidateVertexFormat();
static void InvalidateVertexFormatIfBound(GLuint vao); static void InvalidateVertexFormatIfBound(GLuint vao);