thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

TINYGL: Use realloc to increase the size of the vertex array

Browse source
This commit is contained in:
Cameron Cawley 2023-02-03 18:49:13 +00:00
parent c89cc0bc4c
commit 4b2e3e6726
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
graphics/tinygl/memory.cpp
View file

@ -45,4 +45,8 @@ void *gl_zalloc(int size) {
return calloc(1, size); return calloc(1, size);
} }
void *gl_realloc(void *p, int size) {
return realloc(p, size);
}
} // end of namespace TinyGL } // end of namespace TinyGL

4
graphics/tinygl/vertex.cpp
View file

@ -209,12 +209,10 @@ void GLContext::glopVertex(GLParam *p) {
if (n >= vertex_max) { if (n >= vertex_max) {
GLVertex *newarray; GLVertex *newarray;
vertex_max <<= 1; // just double size vertex_max <<= 1; // just double size
newarray = (GLVertex *)gl_malloc(sizeof(GLVertex) * vertex_max); newarray = (GLVertex *)gl_realloc(vertex, sizeof(GLVertex) * vertex_max);
if (!newarray) { if (!newarray) {
error("unable to allocate GLVertex array."); error("unable to allocate GLVertex array.");
} }
memcpy(newarray, vertex, n * sizeof(GLVertex));
gl_free(vertex);
vertex = newarray; vertex = newarray;
} }
// new vertex entry // new vertex entry

1
graphics/tinygl/zbuffer.h
View file

@ -742,6 +742,7 @@ private:
void gl_free(void *p); void gl_free(void *p);
void *gl_malloc(int size); void *gl_malloc(int size);
void *gl_zalloc(int size); void *gl_zalloc(int size);
void *gl_realloc(void *p, int size);
} // end of namespace TinyGL } // end of namespace TinyGL