teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-16 01:11:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

sd

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5344 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
Plagman 2015-09-11 21:36:57 +00:00
parent 5ea8625c37
commit 6de7ed8d72
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
polymer/eduke32/build/src/polymer.c
View file

@ -1033,8 +1033,11 @@ void polymer_loadboard(void)
bglGenBuffersARB(1, &prindexringvbo); bglGenBuffersARB(1, &prindexringvbo);
bglBindBufferARB(GL_ELEMENT_ARRAY_BUFFER, prindexringvbo); bglBindBufferARB(GL_ELEMENT_ARRAY_BUFFER, prindexringvbo);
if (pr_buckets)
{
bglBufferStorage(GL_ELEMENT_ARRAY_BUFFER, prindexringsize * sizeof(GLuint), NULL, prindexringmapflags | GL_DYNAMIC_STORAGE_BIT); bglBufferStorage(GL_ELEMENT_ARRAY_BUFFER, prindexringsize * sizeof(GLuint), NULL, prindexringmapflags | GL_DYNAMIC_STORAGE_BIT);
prindexring = (GLuint*)bglMapBufferRange(GL_ELEMENT_ARRAY_BUFFER, 0, prindexringsize * sizeof(GLuint), prindexringmapflags); prindexring = (GLuint*)bglMapBufferRange(GL_ELEMENT_ARRAY_BUFFER, 0, prindexringsize * sizeof(GLuint), prindexringmapflags);
}
bglBindBufferARB(GL_ELEMENT_ARRAY_BUFFER, 0); bglBindBufferARB(GL_ELEMENT_ARRAY_BUFFER, 0);
@ -2134,6 +2137,9 @@ static void polymer_emptybuckets(void)
{ {
_prbucket *bucket = prbuckethead; _prbucket *bucket = prbuckethead;
if (pr_buckets == 0)
return;
bglBindBufferARB(GL_ARRAY_BUFFER_ARB, prmapvbo); bglBindBufferARB(GL_ARRAY_BUFFER_ARB, prmapvbo);
bglVertexPointer(3, GL_FLOAT, sizeof(_prvert), NULL); bglVertexPointer(3, GL_FLOAT, sizeof(_prvert), NULL);
bglTexCoordPointer(2, GL_FLOAT, sizeof(_prvert), (GLvoid *)(3 * sizeof(GLfloat))); bglTexCoordPointer(2, GL_FLOAT, sizeof(_prvert), (GLvoid *)(3 * sizeof(GLfloat)));
@ -2244,7 +2250,7 @@ static void polymer_bucketplane(_prplane* plane)
{ {
_prbucket *bucketptr = plane->bucket; _prbucket *bucketptr = plane->bucket;
uint32_t neededindicecount; uint32_t neededindicecount;
uint32_t i; int32_t i;
// we don't keep buffers for quads // we don't keep buffers for quads
neededindicecount = (plane->indicescount == 0) ? 6 : plane->indicescount; neededindicecount = (plane->indicescount == 0) ? 6 : plane->indicescount;
@ -2338,7 +2344,7 @@ static void polymer_drawplane(_prplane* plane)
GLuint planevbo; GLuint planevbo;
GLintptrARB geomfbooffset; GLintptrARB geomfbooffset;
if (plane->mapvbo_vertoffset != -1) if (plane->mapvbo_vertoffset != (uint32_t)-1)
{ {
planevbo = prmapvbo; planevbo = prmapvbo;
geomfbooffset = plane->mapvbo_vertoffset * sizeof(_prvert); geomfbooffset = plane->mapvbo_vertoffset * sizeof(_prvert);