zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-04-25 01:01:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

add pr_nullrender variable to toggle drawing and updating GL buffers

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5266 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
Plagman 2015-06-14 23:42:31 +00:00
parent efe3d87cf8
commit 18b3984a97
3 changed files with 69 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
polymer/eduke32/build/include/polymer.h
View file

@ -56,6 +56,7 @@ extern int32_t pr_ati_nodepthoffset;
#ifdef __APPLE__ #ifdef __APPLE__
extern int32_t pr_ati_textureformat_one; extern int32_t pr_ati_textureformat_one;
#endif #endif
extern int32_t pr_nullrender;
extern int32_t r_pr_maxlightpasses; extern int32_t r_pr_maxlightpasses;

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

@ -47,6 +47,7 @@ int32_t pr_ati_nodepthoffset = 0;
#ifdef __APPLE__ #ifdef __APPLE__
int32_t pr_ati_textureformat_one = 0; int32_t pr_ati_textureformat_one = 0;
#endif #endif
int32_t pr_nullrender = 0; // 1: no draw, 2: no draw or updates
int32_t r_pr_maxlightpasses = 5; // value of the cvar (not live value), used to detect changes int32_t r_pr_maxlightpasses = 5; // value of the cvar (not live value), used to detect changes
@ -2067,6 +2068,8 @@ static void polymer_drawplane(_prplane* plane)
{ {
int32_t materialbits; int32_t materialbits;
if (pr_nullrender >= 1) return;
// debug code for drawing plane inverse TBN // debug code for drawing plane inverse TBN
// bglDisable(GL_TEXTURE_2D); // bglDisable(GL_TEXTURE_2D);
// bglBegin(GL_LINES); // bglBegin(GL_LINES);
@ -2348,6 +2351,8 @@ static int32_t polymer_updatesector(int16_t sectnum)
char curxpanning, curypanning; char curxpanning, curypanning;
GLfloat* curbuffer; GLfloat* curbuffer;
if (pr_nullrender >= 3) return 0;
s = prsectors[sectnum]; s = prsectors[sectnum];
sec = (tsectortype *)&sector[sectnum]; sec = (tsectortype *)&sector[sectnum];
@ -2520,11 +2525,14 @@ static int32_t polymer_updatesector(int16_t sectnum)
attributes: attributes:
if ((pr_vbos > 0) && ((i == -1) || (wallinvalidate))) if ((pr_vbos > 0) && ((i == -1) || (wallinvalidate)))
{ {
bglBindBufferARB(GL_ARRAY_BUFFER_ARB, s->floor.vbo); if (pr_nullrender < 2)
bglBufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, sec->wallnum * sizeof(GLfloat) * 5, s->floor.buffer); {
bglBindBufferARB(GL_ARRAY_BUFFER_ARB, s->ceil.vbo); bglBindBufferARB(GL_ARRAY_BUFFER_ARB, s->floor.vbo);
bglBufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, sec->wallnum * sizeof(GLfloat) * 5, s->ceil.buffer); bglBufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, sec->wallnum * sizeof(GLfloat)* 5, s->floor.buffer);
bglBindBufferARB(GL_ARRAY_BUFFER_ARB, 0); bglBindBufferARB(GL_ARRAY_BUFFER_ARB, s->ceil.vbo);
bglBufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, sec->wallnum * sizeof(GLfloat)* 5, s->ceil.buffer);
bglBindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
}
} }
if ((!s->flags.empty) && (!s->flags.invalidtex) && if ((!s->flags.empty) && (!s->flags.invalidtex) &&
@ -2567,19 +2575,22 @@ finish:
polymer_buildfloor(sectnum); polymer_buildfloor(sectnum);
if ((pr_vbos > 0)) if ((pr_vbos > 0))
{ {
if (s->oldindicescount < s->indicescount) if (pr_nullrender < 2)
{ {
bglBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, s->floor.ivbo); if (s->oldindicescount < s->indicescount)
bglBufferDataARB(GL_ELEMENT_ARRAY_BUFFER_ARB, s->indicescount * sizeof(GLushort), NULL, mapvbousage); {
bglBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, s->ceil.ivbo); bglBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, s->floor.ivbo);
bglBufferDataARB(GL_ELEMENT_ARRAY_BUFFER_ARB, s->indicescount * sizeof(GLushort), NULL, mapvbousage); bglBufferDataARB(GL_ELEMENT_ARRAY_BUFFER_ARB, s->indicescount * sizeof(GLushort), NULL, mapvbousage);
s->oldindicescount = s->indicescount; bglBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, s->ceil.ivbo);
} bglBufferDataARB(GL_ELEMENT_ARRAY_BUFFER_ARB, s->indicescount * sizeof(GLushort), NULL, mapvbousage);
bglBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, s->floor.ivbo); s->oldindicescount = s->indicescount;
bglBufferSubDataARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0, s->indicescount * sizeof(GLushort), s->floor.indices); }
bglBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, s->ceil.ivbo); bglBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, s->floor.ivbo);
bglBufferSubDataARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0, s->indicescount * sizeof(GLushort), s->ceil.indices); bglBufferSubDataARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0, s->indicescount * sizeof(GLushort), s->floor.indices);
bglBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0); bglBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, s->ceil.ivbo);
bglBufferSubDataARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0, s->indicescount * sizeof(GLushort), s->ceil.indices);
bglBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0);
}
} }
} }
@ -2861,6 +2872,8 @@ static void polymer_updatewall(int16_t wallnum)
uint32_t invalid; uint32_t invalid;
int32_t sectofwall = sectorofwall(wallnum); int32_t sectofwall = sectorofwall(wallnum);
if (pr_nullrender >= 3) return;
// yes, this function is messy and unefficient // yes, this function is messy and unefficient
// it also works, bitches // it also works, bitches
sec = &sector[sectofwall]; sec = &sector[sectofwall];
@ -3223,17 +3236,20 @@ static void polymer_updatewall(int16_t wallnum)
if ((pr_vbos > 0)) if ((pr_vbos > 0))
{ {
bglBindBufferARB(GL_ARRAY_BUFFER_ARB, w->wall.vbo); if (pr_nullrender < 2)
bglBufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, 4 * sizeof(GLfloat) * 5, w->wall.buffer); {
bglBindBufferARB(GL_ARRAY_BUFFER_ARB, w->over.vbo); bglBindBufferARB(GL_ARRAY_BUFFER_ARB, w->wall.vbo);
if (w->over.buffer) bglBufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, 4 * sizeof(GLfloat)* 5, w->wall.buffer);
bglBufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, 4 * sizeof(GLfloat) * 5, w->over.buffer); bglBindBufferARB(GL_ARRAY_BUFFER_ARB, w->over.vbo);
bglBindBufferARB(GL_ARRAY_BUFFER_ARB, w->mask.vbo); if (w->over.buffer)
bglBufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, 4 * sizeof(GLfloat) * 5, w->mask.buffer); bglBufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, 4 * sizeof(GLfloat)* 5, w->over.buffer);
bglBindBufferARB(GL_ARRAY_BUFFER_ARB, w->stuffvbo); bglBindBufferARB(GL_ARRAY_BUFFER_ARB, w->mask.vbo);
bglBufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, 4 * sizeof(GLfloat) * 5, w->bigportal); bglBufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, 4 * sizeof(GLfloat)* 5, w->mask.buffer);
bglBufferSubDataARB(GL_ARRAY_BUFFER_ARB, 4 * sizeof(GLfloat) * 5, 4 * sizeof(GLfloat) * 3, w->cap); bglBindBufferARB(GL_ARRAY_BUFFER_ARB, w->stuffvbo);
bglBindBufferARB(GL_ARRAY_BUFFER_ARB, 0); bglBufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, 4 * sizeof(GLfloat)* 5, w->bigportal);
bglBufferSubDataARB(GL_ARRAY_BUFFER_ARB, 4 * sizeof(GLfloat)* 5, 4 * sizeof(GLfloat)* 3, w->cap);
bglBindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
}
} }
w->flags.empty = 0; w->flags.empty = 0;
@ -3550,6 +3566,8 @@ void polymer_updatesprite(int32_t snum)
const uint32_t alignmask = (cs & SPR_ALIGN_MASK); const uint32_t alignmask = (cs & SPR_ALIGN_MASK);
const uint8_t flooraligned = (alignmask==SPR_FLOOR); const uint8_t flooraligned = (alignmask==SPR_FLOOR);
if (pr_nullrender >= 3) return;
if (pr_verbosity >= 3) OSD_Printf("PR : Updating sprite %i...\n", snum); if (pr_verbosity >= 3) OSD_Printf("PR : Updating sprite %i...\n", snum);
if (tspr->owner < 0 || tspr->picnum < 0) return; if (tspr->owner < 0 || tspr->picnum < 0) return;
@ -3564,9 +3582,12 @@ void polymer_updatesprite(int32_t snum)
if ((tspr->cstat & 48) && (pr_vbos > 0) && !prsprites[tspr->owner]->plane.vbo) if ((tspr->cstat & 48) && (pr_vbos > 0) && !prsprites[tspr->owner]->plane.vbo)
{ {
bglGenBuffersARB(1, &prsprites[tspr->owner]->plane.vbo); if (pr_nullrender < 2)
bglBindBufferARB(GL_ARRAY_BUFFER_ARB, prsprites[tspr->owner]->plane.vbo); {
bglBufferDataARB(GL_ARRAY_BUFFER_ARB, 4 * sizeof(GLfloat) * 5, NULL, mapvbousage); bglGenBuffersARB(1, &prsprites[tspr->owner]->plane.vbo);
bglBindBufferARB(GL_ARRAY_BUFFER_ARB, prsprites[tspr->owner]->plane.vbo);
bglBufferDataARB(GL_ARRAY_BUFFER_ARB, 4 * sizeof(GLfloat)* 5, NULL, mapvbousage);
}
} }
s = prsprites[tspr->owner]; s = prsprites[tspr->owner];
@ -3732,17 +3753,20 @@ void polymer_updatesprite(int32_t snum)
polymer_computeplane(&s->plane); polymer_computeplane(&s->plane);
if (alignmask && (pr_vbos > 0)) if (pr_nullrender < 2)
{ {
bglBindBufferARB(GL_ARRAY_BUFFER_ARB, s->plane.vbo); if (alignmask && (pr_vbos > 0))
bglBufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, 4 * sizeof(GLfloat) * 5, s->plane.buffer); {
bglBindBufferARB(GL_ARRAY_BUFFER_ARB, 0); bglBindBufferARB(GL_ARRAY_BUFFER_ARB, s->plane.vbo);
} bglBufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, 4 * sizeof(GLfloat)* 5, s->plane.buffer);
else if (s->plane.vbo) // clean up the vbo if a wall/floor sprite becomes a face sprite bglBindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
{ }
bglDeleteBuffersARB(1, &s->plane.vbo); else if (s->plane.vbo) // clean up the vbo if a wall/floor sprite becomes a face sprite
s->plane.vbo = 0; {
} bglDeleteBuffersARB(1, &s->plane.vbo);
s->plane.vbo = 0;
}
}
if (alignmask) if (alignmask)
{ {

1
polymer/eduke32/build/src/polymost.c
View file

@ -5650,6 +5650,7 @@ void polymost_initosdfuncs(void)
{ "r_pr_overridemodelscale", "overrides model scale if non-zero; use it to fine-tune DEF tokens", (void *) &pr_overridemodelscale, CVAR_FLOAT | CVAR_NOSAVE, 0, 500 }, { "r_pr_overridemodelscale", "overrides model scale if non-zero; use it to fine-tune DEF tokens", (void *) &pr_overridemodelscale, CVAR_FLOAT | CVAR_NOSAVE, 0, 500 },
{ "r_pr_ati_fboworkaround", "enable this to workaround an ATI driver bug that causes sprite shadows to be square - you need to restart the renderer for it to take effect", (void *) &pr_ati_fboworkaround, CVAR_BOOL | CVAR_NOSAVE, 0, 1 }, { "r_pr_ati_fboworkaround", "enable this to workaround an ATI driver bug that causes sprite shadows to be square - you need to restart the renderer for it to take effect", (void *) &pr_ati_fboworkaround, CVAR_BOOL | CVAR_NOSAVE, 0, 1 },
{ "r_pr_ati_nodepthoffset", "enable this to workaround an ATI driver bug that causes sprite drawing to freeze the game on Radeon X1x00 hardware - you need to restart the renderer for it to take effect", (void *) &pr_ati_nodepthoffset, CVAR_BOOL | CVAR_NOSAVE, 0, 1 }, { "r_pr_ati_nodepthoffset", "enable this to workaround an ATI driver bug that causes sprite drawing to freeze the game on Radeon X1x00 hardware - you need to restart the renderer for it to take effect", (void *) &pr_ati_nodepthoffset, CVAR_BOOL | CVAR_NOSAVE, 0, 1 },
{ "r_pr_nullrender", "disable all draws when enabled, 2: disables updates too", (void *)&pr_nullrender, CVAR_INT | CVAR_NOSAVE, 0, 3 },
#endif #endif
#ifdef __ANDROID__ #ifdef __ANDROID__