piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-23 14:19:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

properly clean up GL resources

Browse Source
This commit is contained in:
Arisotura
2019-05-19 23:06:42 +02:00
parent 6dbb645ffa
commit 1fb3968047
1 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/GPU3D_OpenGL43.cpp
View File

@ -104,16 +104,8 @@ int FrontBuffer;
GLuint FramebufferID[4], PixelbufferID; GLuint FramebufferID[4], PixelbufferID;
u32* Framebuffer = NULL; u32* Framebuffer = NULL;
bool ChunkedRendering = false;
bool InitGLExtensions()
{
// TODO move this elsewhere!!
//if (!OpenGL_Init()) return false;
return true;
}
bool BuildRenderShader(u32 flags, const char* vs, const char* fs) bool BuildRenderShader(u32 flags, const char* vs, const char* fs)
{ {
char shadername[32]; char shadername[32];
@ -159,8 +151,6 @@ void SetupDefaultTexParams(GLuint tex)
bool Init() bool Init()
{ {
if (!InitGLExtensions()) return false;
const GLubyte* renderer = glGetString(GL_RENDERER); // get renderer string const GLubyte* renderer = glGetString(GL_RENDERER); // get renderer string
const GLubyte* version = glGetString(GL_VERSION); // version as a string const GLubyte* version = glGetString(GL_VERSION); // version as a string
printf("OpenGL: renderer: %s\n", renderer); printf("OpenGL: renderer: %s\n", renderer);
@ -341,7 +331,24 @@ bool Init()
void DeInit() void DeInit()
{ {
// TODO CLEAN UP SHIT!!!! glDeleteTextures(1, &TexMemID);
glDeleteTextures(1, &TexPalMemID);
glDeleteFramebuffers(4, &FramebufferID[0]);
glDeleteTextures(8, &FramebufferTex[0]);
glDeleteVertexArrays(1, &VertexArrayID);
glDeleteBuffers(1, &VertexBufferID);
glDeleteVertexArrays(1, &ClearVertexArrayID);
glDeleteBuffers(1, &ClearVertexBufferID);
glDeleteBuffers(1, &ShaderConfigUBO);
for (int i = 0; i < 16; i++)
{
if (!RenderShader[i][2]) continue;
OpenGL_DeleteShaderProgram(RenderShader[i]);
}
} }
void Reset() void Reset()
@ -696,6 +703,8 @@ void RenderSceneChunk(int y, int h)
_endptr = rp->Indices; _endptr = rp->Indices;
break; break;
} }
// berg.
} }
u32 num = (u32)(_endptr - iptr); u32 num = (u32)(_endptr - iptr);
if (num) glDrawElements(GL_TRIANGLES, num, GL_UNSIGNED_SHORT, iptr); if (num) glDrawElements(GL_TRIANGLES, num, GL_UNSIGNED_SHORT, iptr);