Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2024-06-24 11:29:33 +00:00
Code Issues Projects Releases Wiki Activity

Silence some valgrind complaints

Browse Source
This commit is contained in:
asc 2014-12-21 13:59:04 -08:00
parent 031a8f51f8
commit 34d043330b
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/interface.c
View File

@ -1353,7 +1353,7 @@ void c_interface_credits()
#define SCROLL_LENGTH 58
#define SCROLL_WIDTH (INTERFACE_SCREEN_X+1-(SCROLL_AREA_X*2))
char credits[SCROLL_LENGTH][SCROLL_WIDTH]=
char credits[SCROLL_LENGTH+1][SCROLL_WIDTH]=
//1. 5. 10. 15. 20. 25. 30. 35. 40. 45. 50. 55. 60. 65. 70. 75. 80.",
{ " ",
" An Apple //e Emulator for POSIX Systems! ",
@ -1412,6 +1412,7 @@ void c_interface_credits()
" > ROM images used by the emulator are copyright Apple Computer ",
" ",
" > Disk images are copyright by various third parties ",
" ",
" " };
video_setpage( 0 );

18
src/video/glvideo.c
View File

@ -236,15 +236,14 @@ static GLuint _create_VAO(demoModel *model) {
}
static void _destroy_VAO(GLuint vaoName) {
GLuint index;
GLuint bufName;
// Bind the VAO so we can get data from it
glBindVertexArray(vaoName);
// For every possible attribute set in the VAO
for (index = 0; index < 16; index++) {
for (GLuint index = 0; index < 16; index++) {
// Get the VBO set for that attibute
GLuint bufName = 0;
glGetVertexAttribiv(index , GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING, (GLint*)&bufName);
// If there was a VBO set...
@ -255,12 +254,15 @@ static void _destroy_VAO(GLuint vaoName) {
}
// Get any element array VBO set in the VAO
glGetIntegerv(GL_ELEMENT_ARRAY_BUFFER_BINDING, (GLint*)&bufName);
{
GLuint bufName = 0;
glGetIntegerv(GL_ELEMENT_ARRAY_BUFFER_BINDING, (GLint*)&bufName);
// If there was a element array VBO set in the VAO
if(bufName) {
//...delete the VBO
glDeleteBuffers(1, &bufName);
// If there was a element array VBO set in the VAO
if (bufName) {
//...delete the VBO
glDeleteBuffers(1, &bufName);
}
}
// Finally, delete the VAO