yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2025-04-03 17:01:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1152 from protocultor/gles1_addendum

Browse source 
Improvements for GL1/GLES1
This commit is contained in:
Yamagi 2024-10-06 10:16:24 +02:00 committed by GitHub
commit 667ddafd83
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 159 additions and 105 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
doc/040_cvarlist.md
View file

@ -508,7 +508,8 @@ it's `+set busywait 0` (setting the `busywait` cvar) and `-portable`
squares.
* **gl1_stencilshadow**: If `gl_shadows` is set to `1`, this makes them
look a bit better (no flickering) by using the stencil buffer.
look a bit better (no flickering) by using the stencil buffer. Does
not work when `gl1_stereo` is `3`, `4` or `5`.
* **gl1_lightmapcopies**: When enabled (`1`), keep 3 copies of the same
lightmap rotating, shifting to another one when drawing a new frame.
@ -516,9 +517,10 @@ it's `+set busywait 0` (setting the `busywait` cvar) and `-portable`
(dynamic lighting) causes slowdown. By default in GL1 is disabled,
while in GLES1 is enabled. Needs `gl1_multitexture 1` & `vid_restart`.
* **gl1_discardfb**: Only available in ES1. If set to `1` (default),
send a hint to discard framebuffers after finishing a frame. Useful
for GPUs that attempt to reuse them, something Quake 2 doesn't do.
* **gl1_discardfb**: If `1`, clear color, depth and stencil buffers at
the start of a frame, and discard them at the end if possible. If
`2`, do only depth and stencil, no color. Increases performance in
mobile / embedded. Default in GL1 is `0`, while in GLES1 is `1`.
## Graphics (OpenGL 3.2 and OpenGL ES3 only)

198
src/client/refresh/gl1/gl1_main.c
View file

@ -150,6 +150,7 @@ void LM_FreeLightmapBuffers(void);
void Scrap_Free(void);
void Scrap_Init(void);
extern void R_SetDefaultState(void);
extern void R_ResetGLBuffer(void);
void
@ -630,6 +631,19 @@ R_PolyBlend(void)
glColor4f(1, 1, 1, 1);
}
static void
R_ResetClearColor(void)
{
if (gl1_discardfb->value == 1 && !r_clear->value)
{
glClearColor(0, 0, 0, 0.5);
}
else
{
glClearColor(1, 0, 0.5, 0.5);
}
}
void
R_SetupFrame(void)
{
@ -707,7 +721,7 @@ R_SetupFrame(void)
vid.height - r_newrefdef.height - r_newrefdef.y,
r_newrefdef.width, r_newrefdef.height);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glClearColor(1, 0, 0.5, 0.5);
R_ResetClearColor();
glDisable(GL_SCISSOR_TEST);
}
}
@ -809,53 +823,72 @@ R_SetupGL(void)
void
R_Clear(void)
{
// Check whether the stencil buffer needs clearing, and do so if need be.
GLbitfield stencilFlags = 0;
if (gl_state.stereo_mode >= STEREO_MODE_ROW_INTERLEAVED && gl_state.stereo_mode <= STEREO_MODE_PIXEL_INTERLEAVED) {
glClearStencil(GL_FALSE);
stencilFlags |= GL_STENCIL_BUFFER_BIT;
// Define which buffers need clearing
GLbitfield clearFlags = 0;
GLenum depthFunc = GL_LEQUAL;
// This breaks stereo modes, but we'll leave that responsibility to the user
if (r_clear->value)
{
clearFlags |= GL_COLOR_BUFFER_BIT;
}
// No stencil shadows allowed when using certain stereo modes, otherwise "wallhack" happens
if (gl_state.stereo_mode >= STEREO_MODE_ROW_INTERLEAVED && gl_state.stereo_mode <= STEREO_MODE_PIXEL_INTERLEAVED)
{
glClearStencil(0);
clearFlags |= GL_STENCIL_BUFFER_BIT;
}
else if (gl_shadows->value && gl_state.stencil && gl1_stencilshadow->value)
{
glClearStencil(1);
clearFlags |= GL_STENCIL_BUFFER_BIT;
}
if (gl1_ztrick->value)
{
static int trickframe;
if (r_clear->value)
{
glClear(GL_COLOR_BUFFER_BIT | stencilFlags);
}
trickframe++;
if (trickframe & 1)
{
gldepthmin = 0;
gldepthmax = 0.49999;
glDepthFunc(GL_LEQUAL);
}
else
{
gldepthmin = 1;
gldepthmax = 0.5;
glDepthFunc(GL_GEQUAL);
depthFunc = GL_GEQUAL;
}
}
else
{
if (r_clear->value)
{
glClear(GL_COLOR_BUFFER_BIT | stencilFlags | GL_DEPTH_BUFFER_BIT);
}
else
{
glClear(GL_DEPTH_BUFFER_BIT | stencilFlags);
}
clearFlags |= GL_DEPTH_BUFFER_BIT;
gldepthmin = 0;
gldepthmax = 1;
glDepthFunc(GL_LEQUAL);
}
switch ((int)gl1_discardfb->value)
{
case 1:
if (gl_state.stereo_mode == STEREO_MODE_NONE)
{
clearFlags |= GL_COLOR_BUFFER_BIT;
}
case 2:
clearFlags |= GL_STENCIL_BUFFER_BIT;
default:
break;
}
if (clearFlags)
{
glClear(clearFlags);
}
glDepthFunc(depthFunc);
glDepthRange(gldepthmin, gldepthmax);
if (gl_zfix->value)
@ -869,13 +902,6 @@ R_Clear(void)
glPolygonOffset(-0.05, -1);
}
}
/* stencilbuffer shadows */
if (gl_shadows->value && gl_state.stencil && gl1_stencilshadow->value)
{
glClearStencil(GL_TRUE);
glClear(GL_STENCIL_BUFFER_BIT);
}
}
void
@ -927,7 +953,6 @@ R_SetGL2D(void)
static void
R_RenderView(refdef_t *fd)
{
#ifndef YQ2_GL1_GLES
if ((gl_state.stereo_mode != STEREO_MODE_NONE) && gl_state.camera_separation) {
qboolean drawing_left_eye = gl_state.camera_separation < 0;
@ -977,6 +1002,13 @@ R_RenderView(refdef_t *fd)
qboolean flip_eyes = true;
int client_x, client_y;
GLshort screen[] = {
0, 0,
(GLshort)vid.width, 0,
(GLshort)vid.width, (GLshort)vid.height,
0, (GLshort)vid.height
};
//GLimp_GetClientAreaOffset(&client_x, &client_y);
client_x = 0;
client_y = 0;
@ -984,47 +1016,53 @@ R_RenderView(refdef_t *fd)
R_SetGL2D();
glEnable(GL_STENCIL_TEST);
glStencilMask(GL_TRUE);
glStencilMask(1);
glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
glStencilOp(GL_REPLACE, GL_KEEP, GL_KEEP);
glStencilFunc(GL_NEVER, 0, 1);
glBegin(GL_QUADS);
{
glVertex2i(0, 0);
glVertex2i(vid.width, 0);
glVertex2i(vid.width, vid.height);
glVertex2i(0, vid.height);
}
glEnd();
glEnableClientState(GL_VERTEX_ARRAY);
glVertexPointer(2, GL_SHORT, 0, screen);
glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
glDisableClientState(GL_VERTEX_ARRAY);
glStencilOp(GL_INVERT, GL_KEEP, GL_KEEP);
glStencilFunc(GL_NEVER, 1, 1);
glBegin(GL_LINES);
if (gl_state.stereo_mode == STEREO_MODE_ROW_INTERLEAVED || gl_state.stereo_mode == STEREO_MODE_PIXEL_INTERLEAVED)
{
if (gl_state.stereo_mode == STEREO_MODE_ROW_INTERLEAVED || gl_state.stereo_mode == STEREO_MODE_PIXEL_INTERLEAVED) {
int y;
for (y = 0; y <= vid.height; y += 2) {
glVertex2f(0, y - 0.5f);
glVertex2f(vid.width, y - 0.5f);
}
flip_eyes ^= (client_y & 1);
}
if (gl_state.stereo_mode == STEREO_MODE_COLUMN_INTERLEAVED || gl_state.stereo_mode == STEREO_MODE_PIXEL_INTERLEAVED) {
int x;
for (x = 0; x <= vid.width; x += 2) {
glVertex2f(x - 0.5f, 0);
glVertex2f(x - 0.5f, vid.height);
}
flip_eyes ^= (client_x & 1);
for (int y = 0; y <= vid.height; y += 2)
{
gl_buf.vtx[gl_buf.vt ] = 0;
gl_buf.vtx[gl_buf.vt + 1] = y - 0.5f;
gl_buf.vtx[gl_buf.vt + 2] = vid.width;
gl_buf.vtx[gl_buf.vt + 3] = y - 0.5f;
gl_buf.vt += 4;
}
flip_eyes ^= (client_y & 1);
}
glEnd();
glStencilMask(GL_FALSE);
if (gl_state.stereo_mode == STEREO_MODE_COLUMN_INTERLEAVED || gl_state.stereo_mode == STEREO_MODE_PIXEL_INTERLEAVED)
{
for (int x = 0; x <= vid.width; x += 2)
{
gl_buf.vtx[gl_buf.vt ] = x - 0.5f;
gl_buf.vtx[gl_buf.vt + 1] = 0;
gl_buf.vtx[gl_buf.vt + 2] = x - 0.5f;
gl_buf.vtx[gl_buf.vt + 3] = vid.height;
gl_buf.vt += 4;
}
flip_eyes ^= (client_x & 1);
}
glEnableClientState(GL_VERTEX_ARRAY);
glVertexPointer(2, GL_FLOAT, 0, gl_buf.vtx);
glDrawArrays(GL_LINES, 0, gl_buf.vt / 2);
glDisableClientState(GL_VERTEX_ARRAY);
gl_buf.vt = 0;
glStencilMask(0);
glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
glStencilFunc(GL_EQUAL, drawing_left_eye ^ flip_eyes, 1);
@ -1035,7 +1073,6 @@ R_RenderView(refdef_t *fd)
break;
}
}
#endif
if (r_norefresh->value)
{
@ -1173,9 +1210,9 @@ RI_RenderFrame(refdef_t *fd)
}
#ifdef YQ2_GL1_GLES
#define DEFAULT_LMCOPIES "1"
#define GLES1_ENABLED_ONLY "1"
#else
#define DEFAULT_LMCOPIES "0"
#define GLES1_ENABLED_ONLY "0"
#endif
void
@ -1232,10 +1269,8 @@ R_Register(void)
gl1_palettedtexture = ri.Cvar_Get("r_palettedtextures", "0", CVAR_ARCHIVE);
gl1_pointparameters = ri.Cvar_Get("gl1_pointparameters", "1", CVAR_ARCHIVE);
gl1_multitexture = ri.Cvar_Get("gl1_multitexture", "1", CVAR_ARCHIVE);
gl1_lightmapcopies = ri.Cvar_Get("gl1_lightmapcopies", DEFAULT_LMCOPIES, CVAR_ARCHIVE);
#ifdef YQ2_GL1_GLES
gl1_discardfb = ri.Cvar_Get("gl1_discardfb", "1", CVAR_ARCHIVE);
#endif
gl1_lightmapcopies = ri.Cvar_Get("gl1_lightmapcopies", GLES1_ENABLED_ONLY, CVAR_ARCHIVE);
gl1_discardfb = ri.Cvar_Get("gl1_discardfb", GLES1_ENABLED_ONLY, CVAR_ARCHIVE);
gl_drawbuffer = ri.Cvar_Get("gl_drawbuffer", "GL_BACK", 0);
r_vsync = ri.Cvar_Get("r_vsync", "1", CVAR_ARCHIVE);
@ -1273,7 +1308,7 @@ R_Register(void)
ri.Cmd_AddCommand("gl_strings", R_Strings);
}
#undef DEFAULT_LMCOPIES
#undef GLES1_ENABLED_ONLY
/*
* Changes the video mode
@ -1677,28 +1712,28 @@ RI_Init(void)
// ----
/* Discard framebuffer: Available only on GLES1, enables the use of a "performance hint"
* to the graphic driver, to get rid of the contents of the depth and stencil buffers.
/* Discard framebuffer: Enables the use of a "performance hint" to the graphic
* driver in GLES1, to get rid of the contents of the different framebuffers.
* Useful for some GPUs that may attempt to keep them and/or write them back to
* external/uniform memory, actions that are useless for Quake 2 rendering path.
* https://registry.khronos.org/OpenGL/extensions/EXT/EXT_discard_framebuffer.txt
* This extension is used by 'gl1_discardfb', and regardless of its existence,
* that cvar will enable glClear at the start of each frame, helping mobile GPUs.
*/
gl_config.discardfb = false;
#ifdef YQ2_GL1_GLES
R_Printf(PRINT_ALL, " - Discard framebuffer: ");
if (strstr(gl_config.extensions_string, "GL_EXT_discard_framebuffer"))
{
qglDiscardFramebufferEXT = (void (APIENTRY *)(GLenum, GLsizei, const GLenum *))
RI_GetProcAddress ("glDiscardFramebufferEXT");
qglDiscardFramebufferEXT = (void (APIENTRY *)(GLenum, GLsizei, const GLenum *))
RI_GetProcAddress ("glDiscardFramebufferEXT");
}
if (gl1_discardfb->value)
{
if (qglDiscardFramebufferEXT)
if (qglDiscardFramebufferEXT) // enough to verify availability
{
gl_config.discardfb = true;
R_Printf(PRINT_ALL, "Okay\n");
}
else
@ -1728,6 +1763,7 @@ RI_Init(void)
// ----
R_ResetClearColor();
R_SetDefaultState();
Scrap_Init();
@ -1767,17 +1803,17 @@ RI_BeginFrame(float camera_separation)
gl_state.camera_separation = camera_separation;
// force a vid_restart if gl1_stereo has been modified.
if ( gl_state.stereo_mode != gl1_stereo->value ) {
if ( gl_state.stereo_mode != gl1_stereo->value )
{
// If we've gone from one mode to another with the same special buffer requirements there's no need to restart.
if ( GL_GetSpecialBufferModeForStereoMode( gl_state.stereo_mode ) == GL_GetSpecialBufferModeForStereoMode( gl1_stereo->value ) ) {
if ( GL_GetSpecialBufferModeForStereoMode( gl_state.stereo_mode ) == GL_GetSpecialBufferModeForStereoMode( gl1_stereo->value ) )
{
gl_state.stereo_mode = gl1_stereo->value;
}
else
{
R_Printf(PRINT_ALL, "stereo supermode changed, restarting video!\n");
cvar_t *ref;
ref = ri.Cvar_Get("vid_fullscreen", "0", CVAR_ARCHIVE);
ref->modified = true;
ri.Cmd_ExecuteText(EXEC_APPEND, "vid_restart\n");
}
}
@ -1872,12 +1908,12 @@ RI_BeginFrame(float camera_separation)
gl1_particle_square->modified = false;
}
#ifndef YQ2_GL1_GLES
/* draw buffer stuff */
if (gl_drawbuffer->modified)
{
gl_drawbuffer->modified = false;
#ifndef YQ2_GL1_GLES
if ((gl_state.camera_separation == 0) || gl_state.stereo_mode != STEREO_MODE_OPENGL)
{
if (Q_stricmp(gl_drawbuffer->string, "GL_FRONT") == 0)
@ -1889,8 +1925,8 @@ RI_BeginFrame(float camera_separation)
glDrawBuffer(GL_BACK);
}
}
}
#endif
}
/* texturemode stuff */
if (gl_texturemode->modified || (gl_config.anisotropic && gl_anisotropic->modified)
@ -1960,7 +1996,7 @@ RI_SetPalette(const unsigned char *palette)
glClearColor(0, 0, 0, 0);
glClear(GL_COLOR_BUFFER_BIT);
glClearColor(1, 0, 0.5, 0.5);
R_ResetClearColor();
}
/* R_DrawBeam */

9
src/client/refresh/gl1/gl1_mesh.c
View file

@ -207,6 +207,11 @@ R_DrawAliasFrameLerp(entity_t *currententity, dmdl_t *paliashdr, float backlerp)
static void
R_DrawAliasShadow(entity_t *currententity, dmdl_t *paliashdr, int posenum)
{
// Don't do stencil test on unsupported stereo modes
const qboolean stencilt = ( gl_state.stencil && gl1_stencilshadow->value &&
( gl_state.stereo_mode < STEREO_MODE_ROW_INTERLEAVED
|| gl_state.stereo_mode > STEREO_MODE_PIXEL_INTERLEAVED ) );
int *order;
vec3_t point;
float height = 0, lheight;
@ -219,7 +224,7 @@ R_DrawAliasShadow(entity_t *currententity, dmdl_t *paliashdr, int posenum)
R_UpdateGLBuffer(buf_shadow, 0, 0, 0, 1);
/* stencilbuffer shadows */
if (gl_state.stencil && gl1_stencilshadow->value)
if (stencilt)
{
glEnable(GL_STENCIL_TEST);
glStencilFunc(GL_EQUAL, 1, 2);
@ -265,7 +270,7 @@ R_DrawAliasShadow(entity_t *currententity, dmdl_t *paliashdr, int posenum)
R_ApplyGLBuffer();
/* stencilbuffer shadows */
if (gl_state.stencil && gl1_stencilshadow->value)
if (stencilt)
{
glDisable(GL_STENCIL_TEST);
}

1
src/client/refresh/gl1/gl1_misc.c
View file

@ -169,7 +169,6 @@ R_Strings(void)
void
R_SetDefaultState(void)
{
glClearColor(1, 0, 0.5, 0.5);
glDisable(GL_MULTISAMPLE);
glCullFace(GL_FRONT);
glEnable(GL_TEXTURE_2D);

21
src/client/refresh/gl1/gl1_sdl.c
View file

@ -38,6 +38,8 @@ static SDL_GLContext context = NULL;
qboolean IsHighDPIaware = false;
static qboolean vsyncActive = false;
extern cvar_t *gl1_discardfb;
// ----
/*
@ -47,13 +49,26 @@ void
RI_EndFrame(void)
{
R_ApplyGLBuffer(); // to draw buffered 2D text
#ifdef YQ2_GL1_GLES
if (gl_config.discardfb)
static const GLenum attachments[3] = {GL_COLOR_EXT, GL_DEPTH_EXT, GL_STENCIL_EXT};
if (qglDiscardFramebufferEXT)
{
static const GLenum attachments[] = { GL_DEPTH_EXT, GL_STENCIL_EXT };
qglDiscardFramebufferEXT(GL_FRAMEBUFFER_OES, 2, attachments);
switch ((int)gl1_discardfb->value)
{
case 1:
qglDiscardFramebufferEXT(GL_FRAMEBUFFER_OES, 3, &attachments[0]);
break;
case 2:
qglDiscardFramebufferEXT(GL_FRAMEBUFFER_OES, 2, &attachments[1]);
break;
default:
break;
}
}
#endif
SDL_GL_SwapWindow(window);
}

22
src/client/refresh/gl1/gl1_surf.c
View file

@ -114,7 +114,7 @@ R_DrawTriangleOutlines(void)
for (k=0; k<3; k++)
{
vtx[0+k] = p->verts [ 0 ][ k ];
vtx[0+k] = p->verts [ 0 ][ k ];
vtx[3+k] = p->verts [ j - 1 ][ k ];
vtx[6+k] = p->verts [ j ][ k ];
vtx[9+k] = p->verts [ 0 ][ k ];
@ -388,7 +388,7 @@ R_BlendLightmaps(const model_t *currentmodel)
}
static void
R_RenderBrushPoly(entity_t *currententity, msurface_t *fa)
R_RenderBrushPoly(msurface_t *fa)
{
int maps;
qboolean is_dynamic = false;
@ -526,10 +526,10 @@ R_DrawAlphaSurfaces(void)
}
static void
R_RenderLightmappedPoly(entity_t *currententity, msurface_t *surf)
R_RenderLightmappedPoly(msurface_t *surf)
{
const int nv = surf->polys->numverts;
int i;
int nv = surf->polys->numverts;
float scroll;
float *v;
@ -747,7 +747,7 @@ dynamic_surf:
}
static void
R_DrawTextureChains(entity_t *currententity)
R_DrawTextureChains(void)
{
int i;
msurface_t *s;
@ -776,7 +776,7 @@ R_DrawTextureChains(entity_t *currententity)
for ( ; s; s = s->texturechain)
{
R_UpdateGLBuffer(buf_singletex, image->texnum, 0, s->flags, 1);
R_RenderBrushPoly(currententity, s);
R_RenderBrushPoly(s);
}
image->texturechain = NULL;
@ -799,7 +799,7 @@ R_DrawTextureChains(entity_t *currententity)
if (!(s->flags & SURF_DRAWTURB))
{
R_UpdateGLBuffer(buf_mtex, image->texnum, s->lightmaptexturenum, 0, 1);
R_RenderLightmappedPoly(currententity, s);
R_RenderLightmappedPoly(s);
}
}
}
@ -819,7 +819,7 @@ R_DrawTextureChains(entity_t *currententity)
if (s->flags & SURF_DRAWTURB)
{
R_UpdateGLBuffer(buf_singletex, image->texnum, 0, s->flags, 1);
R_RenderBrushPoly(currententity, s);
R_RenderBrushPoly(s);
}
}
@ -887,12 +887,12 @@ R_DrawInlineBModel(entity_t *currententity, const model_t *currentmodel)
{
// Dynamic lighting already generated in R_GetBrushesLighting()
R_UpdateGLBuffer(buf_mtex, image->texnum, psurf->lightmaptexturenum, 0, 1);
R_RenderLightmappedPoly(currententity, psurf);
R_RenderLightmappedPoly(psurf);
}
else
{
R_UpdateGLBuffer(buf_singletex, image->texnum, 0, psurf->flags, 1);
R_RenderBrushPoly(currententity, psurf);
R_RenderBrushPoly(psurf);
}
}
}
@ -1246,7 +1246,7 @@ R_DrawWorld(void)
R_RecursiveWorldNode(&ent, r_worldmodel->nodes);
R_GetBrushesLighting();
R_RegenAllLightmaps();
R_DrawTextureChains(&ent);
R_DrawTextureChains();
R_BlendLightmaps(r_worldmodel);
R_DrawSkyBox();
R_DrawTriangleOutlines();

3
src/client/refresh/gl1/header/local.h
View file

@ -148,8 +148,6 @@ typedef struct // 832k aprox.
#include "model.h"
void R_SetDefaultState(void);
extern glbuffer_t gl_buf;
extern float gldepthmin, gldepthmax;
@ -427,7 +425,6 @@ typedef struct
qboolean pointparameters;
qboolean multitexture;
qboolean lightmapcopies; // many copies of same lightmap, for embedded
qboolean discardfb;
// ----