mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2024-11-27 14:42:07 +00:00
b25de4d995
This severely reduces the calles to BindTexture, and more importantly, glUseProgram, EnableVertexAttribArray etc. The biggest changes are: o icons and text are all in the one giant texture o icons and text are mixed in the one queue This gave ~9% speedup for bigass1 (159->174fps).
253 lines
5.5 KiB
C
253 lines
5.5 KiB
C
/*
|
|
glsl_main.c
|
|
|
|
GLSL rendering
|
|
|
|
Copyright (C) 2011 Bill Currie <bill@taniwha.org>
|
|
|
|
Author: Bill Currie <bill@taniwha.org>
|
|
Date: 2011/12/23
|
|
|
|
This program is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU General Public License
|
|
as published by the Free Software Foundation; either version 2
|
|
of the License, or (at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
|
|
See the GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to:
|
|
|
|
Free Software Foundation, Inc.
|
|
59 Temple Place - Suite 330
|
|
Boston, MA 02111-1307, USA
|
|
|
|
*/
|
|
#ifdef HAVE_CONFIG_H
|
|
# include "config.h"
|
|
#endif
|
|
|
|
#define NH_DEFINE
|
|
#include "namehack.h"
|
|
|
|
#ifdef HAVE_STRING_H
|
|
# include "string.h"
|
|
#endif
|
|
#ifdef HAVE_STRINGS_H
|
|
# include "strings.h"
|
|
#endif
|
|
|
|
#include "QF/cvar.h"
|
|
#include "QF/draw.h"
|
|
#include "QF/dstring.h"
|
|
#include "QF/image.h"
|
|
#include "QF/png.h"
|
|
#include "QF/quakefs.h"
|
|
#include "QF/render.h"
|
|
#include "QF/screen.h"
|
|
#include "QF/skin.h"
|
|
#include "QF/sys.h"
|
|
#include "QF/va.h"
|
|
|
|
#include "QF/GLSL/defines.h"
|
|
#include "QF/GLSL/funcs.h"
|
|
#include "QF/GLSL/qf_draw.h"
|
|
#include "QF/GLSL/qf_textures.h"
|
|
#include "QF/GLSL/qf_vid.h"
|
|
|
|
#include "r_internal.h"
|
|
|
|
/* Unknown renamed to GLErr_Unknown to solve conflict with winioctl.h */
|
|
static unsigned int GLErr_InvalidEnum;
|
|
static unsigned int GLErr_InvalidValue;
|
|
static unsigned int GLErr_InvalidOperation;
|
|
static unsigned int GLErr_OutOfMemory;
|
|
static unsigned int GLErr_Unknown;
|
|
|
|
extern void (*R_DrawSpriteModel) (struct entity_s *ent);
|
|
|
|
|
|
static unsigned int
|
|
R_TestErrors (unsigned int numerous)
|
|
{
|
|
switch (qfeglGetError ()) {
|
|
case GL_NO_ERROR:
|
|
return numerous;
|
|
break;
|
|
case GL_INVALID_ENUM:
|
|
GLErr_InvalidEnum++;
|
|
R_TestErrors (numerous++);
|
|
break;
|
|
case GL_INVALID_VALUE:
|
|
GLErr_InvalidValue++;
|
|
R_TestErrors (numerous++);
|
|
break;
|
|
case GL_INVALID_OPERATION:
|
|
GLErr_InvalidOperation++;
|
|
R_TestErrors (numerous++);
|
|
break;
|
|
case GL_OUT_OF_MEMORY:
|
|
GLErr_OutOfMemory++;
|
|
R_TestErrors (numerous++);
|
|
break;
|
|
default:
|
|
GLErr_Unknown++;
|
|
R_TestErrors (numerous++);
|
|
break;
|
|
}
|
|
|
|
return numerous;
|
|
}
|
|
|
|
static void
|
|
R_DisplayErrors (void)
|
|
{
|
|
if (GLErr_InvalidEnum)
|
|
printf ("%d OpenGL errors: Invalid Enum!\n", GLErr_InvalidEnum);
|
|
if (GLErr_InvalidValue)
|
|
printf ("%d OpenGL errors: Invalid Value!\n", GLErr_InvalidValue);
|
|
if (GLErr_InvalidOperation)
|
|
printf ("%d OpenGL errors: Invalid Operation!\n", GLErr_InvalidOperation);
|
|
if (GLErr_OutOfMemory)
|
|
printf ("%d OpenGL errors: Out Of Memory!\n", GLErr_OutOfMemory);
|
|
if (GLErr_Unknown)
|
|
printf ("%d Unknown OpenGL errors!\n", GLErr_Unknown);
|
|
}
|
|
|
|
static void
|
|
R_ClearErrors (void)
|
|
{
|
|
GLErr_InvalidEnum = 0;
|
|
GLErr_InvalidValue = 0;
|
|
GLErr_InvalidOperation = 0;
|
|
GLErr_OutOfMemory = 0;
|
|
GLErr_Unknown = 0;
|
|
}
|
|
|
|
static void
|
|
SCR_TileClear (void)
|
|
{
|
|
if (r_refdef.vrect.x > 0) {
|
|
// left
|
|
Draw_TileClear (0, 0, r_refdef.vrect.x, vid.height - vr_data.lineadj);
|
|
// right
|
|
Draw_TileClear (r_refdef.vrect.x + r_refdef.vrect.width, 0,
|
|
vid.width - r_refdef.vrect.x + r_refdef.vrect.width,
|
|
vid.height - vr_data.lineadj);
|
|
}
|
|
if (r_refdef.vrect.y > 0) {
|
|
// top
|
|
Draw_TileClear (r_refdef.vrect.x, 0,
|
|
r_refdef.vrect.x + r_refdef.vrect.width,
|
|
r_refdef.vrect.y);
|
|
// bottom
|
|
Draw_TileClear (r_refdef.vrect.x,
|
|
r_refdef.vrect.y + r_refdef.vrect.height,
|
|
r_refdef.vrect.width,
|
|
vid.height - vr_data.lineadj -
|
|
(r_refdef.vrect.height + r_refdef.vrect.y));
|
|
}
|
|
}
|
|
|
|
void
|
|
glsl_SCR_UpdateScreen (double realtime, SCR_Func scr_3dfunc,
|
|
SCR_Func *scr_funcs)
|
|
{
|
|
static int begun = 0;
|
|
|
|
if (R_TestErrors (0))
|
|
R_DisplayErrors ();
|
|
R_ClearErrors ();
|
|
|
|
if (begun) {
|
|
begun = 0;
|
|
vid.end_rendering ();
|
|
}
|
|
|
|
vr_data.realtime = realtime;
|
|
//FIXME useless cvar? vid.numpages = 2 + gl_triplebuffer->int_val;
|
|
|
|
if (!scr_initialized)
|
|
return;
|
|
|
|
qfeglClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
|
|
|
|
begun = 1;
|
|
|
|
if (oldfov != scr_fov->value) {
|
|
oldfov = scr_fov->value;
|
|
vid.recalc_refdef = true;
|
|
}
|
|
if (vid.recalc_refdef)
|
|
SCR_CalcRefdef ();
|
|
|
|
scr_3dfunc ();
|
|
|
|
SCR_SetUpToDrawConsole ();
|
|
GLSL_Set2D ();
|
|
GLSL_DrawReset ();
|
|
SCR_TileClear ();
|
|
GLSL_Set2DScaled ();
|
|
while (*scr_funcs) {
|
|
(*scr_funcs)();
|
|
scr_funcs++;
|
|
GLSL_FlushText ();
|
|
}
|
|
GLSL_End2D ();
|
|
qfeglFlush ();
|
|
}
|
|
|
|
tex_t *
|
|
glsl_SCR_CaptureBGR (void)
|
|
{
|
|
byte *r, *b;
|
|
int count, i;
|
|
tex_t *tex;
|
|
|
|
count = vid.width * vid.height;
|
|
tex = malloc (field_offset (tex_t, data[count * 3]));
|
|
SYS_CHECKMEM (tex);
|
|
tex->width = vid.width;
|
|
tex->height = vid.height;
|
|
tex->format = tex_rgb;
|
|
tex->palette = 0;
|
|
qfeglReadPixels (0, 0, vid.width, vid.height, GL_RGB,
|
|
GL_UNSIGNED_BYTE, tex->data);
|
|
for (i = 0, r = tex->data, b = tex->data + 2; i < count;
|
|
i++, r += 3, b += 3) {
|
|
byte t = *b;
|
|
*b = *r;
|
|
*r = t;
|
|
}
|
|
return tex;
|
|
}
|
|
|
|
tex_t *
|
|
glsl_SCR_ScreenShot (int width, int height)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
void
|
|
glsl_SCR_ScreenShot_f (void)
|
|
{
|
|
dstring_t *name = dstring_new ();
|
|
|
|
// find a file name to save it to
|
|
if (!QFS_NextFilename (name,
|
|
va ("%s/qf", qfs_gamedir->dir.shots), ".png")) {
|
|
Sys_Printf ("SCR_ScreenShot_f: Couldn't create a PNG file\n");
|
|
} else {
|
|
tex_t *tex;
|
|
|
|
tex = glsl_SCR_CaptureBGR ();
|
|
WritePNGqfs (name->str, tex->data, tex->width, tex->height);
|
|
free (tex);
|
|
Sys_Printf ("Wrote %s/%s\n", qfs_userpath, name->str);
|
|
}
|
|
dstring_delete (name);
|
|
}
|