forks
/
arsd
mirror of https://github.com/adamdruppe/arsd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix nanovega tainting the active VAO 

this is both needed for modern opengl because if you are unlucky with your graphics drivers there it won't render anything when the core context is enabled, but also when rendering custom data and having stray VAOs open that you didn't unbind on the start of the nanovega render calls.

stuff like `glEnableVertexAttribArray` and `glVertexAttribPointer`, which is called below, is only valid with a VAO bound.
This commit is contained in:
WebFreak001 2024-01-25 00:34:47 +01:00
parent 614e15fc9a
commit 859913939f
No known key found for this signature in database
GPG Key ID: AEFC88D11109D1AA
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nanovega.d
View File

@ -12516,6 +12516,7 @@ struct GLNVGcontext {
int freetexid; // -1: none
int ntextures;
int ctextures;
GLuint vaoBuf;
GLuint vertBuf;
int fragSize;
int flags;
@ -13273,6 +13274,8 @@ bool glnvg__renderCreate (void* uptr) nothrow @trusted @nogc {
glnvg__getUniforms(&gl.shaderFillFBO);
glnvg__getUniforms(&gl.shaderCopyFBO);
// Create VAO (required for modern OpenGL compatibility)
glGenVertexArrays(1, &gl.vaoBuf);
// Create dynamic vertex array
glGenBuffers(1, &gl.vertBuf);
@ -14006,6 +14009,7 @@ void glnvg__renderFlush (void* uptr) nothrow @trusted @nogc {
}
glnvg__checkError(gl, "OpenGL setup");
glBindVertexArray(gl.vaoBuf);
// Upload vertex data
glBindBuffer(GL_ARRAY_BUFFER, gl.vertBuf);
// ensure that there's space for at least 4 vertices in case we need to draw a quad (e. g. framebuffer copy)
@ -14129,6 +14133,7 @@ void glnvg__renderFlush (void* uptr) nothrow @trusted @nogc {
glDisableVertexAttribArray(1);
glDisable(GL_CULL_FACE);
glBindBuffer(GL_ARRAY_BUFFER, 0);
glBindVertexArray(0);
glUseProgram(0);
glnvg__bindTexture(gl, 0);
}
@ -14407,6 +14412,7 @@ void glnvg__renderDelete (void* uptr) nothrow @trusted @nogc {
glnvg__deleteShader(&gl.shaderFillFBO);
glnvg__deleteShader(&gl.shaderCopyFBO);
if (gl.vaoBuf != 0) glDeleteVertexArrays(1, &gl.vaoBuf);
if (gl.vertBuf != 0) glDeleteBuffers(1, &gl.vertBuf);
foreach (ref GLNVGtexture tex; gl.textures[0..gl.ntextures]) {