iikorni/quakespasm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More conversion

Browse Source
This commit is contained in:
iikorni
2026-08-29 19:17:46 -05:00
parent 0404d430dc
commit 70e5c02355
72 changed files with 13308 additions and 14309 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Quake/gl_rmisc.cpp
+354 -378
View File
@@ -22,35 +22,37 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
// r_misc.c
#include <sstream>
#include "quakedef.hpp"
//johnfitz -- new cvars
extern cvar_t r_stereo;
extern cvar_t r_stereodepth;
extern cvar_t r_clearcolor;
extern cvar_t r_drawflat;
extern cvar_t r_flatlightstyles;
extern cvar_t gl_fullbrights;
extern cvar_t gl_farclip;
extern cvar_t gl_overbright;
extern cvar_t gl_overbright_models;
extern cvar_t r_waterquality;
extern cvar_t r_oldwater;
extern cvar_t r_waterwarp;
extern cvar_t r_oldskyleaf;
extern cvar_t r_drawworld;
extern cvar_t r_showtris;
extern cvar_t r_showbboxes;
extern cvar_t r_lerpmodels;
extern cvar_t r_lerpmove;
extern cvar_t r_nolerp_list;
extern cvar_t r_noshadow_list;
extern convar r_stereo;
extern convar r_stereodepth;
extern convar r_clearcolor;
extern convar r_drawflat;
extern convar r_flatlightstyles;
extern convar gl_fullbrights;
extern convar gl_farclip;
extern convar gl_overbright;
extern convar gl_overbright_models;
extern convar r_waterquality;
extern convar r_oldwater;
extern convar r_waterwarp;
extern convar r_oldskyleaf;
extern convar r_drawworld;
extern convar r_showtris;
extern convar r_showbboxes;
extern convar r_lerpmodels;
extern convar r_lerpmove;
extern convar r_nolerp_list;
extern convar r_noshadow_list;
//johnfitz
extern cvar_t gl_zfix; // QuakeSpasm z-fighting fix
extern convar gl_zfix; // QuakeSpasm z-fighting fix
extern gltexture_t *playertextures[MAX_SCOREBOARD]; //johnfitz
cvar_t r_lightmapwide = {"r_lightmapwide","0",CVAR_ROM};
convar r_lightmapwide = {"r_lightmapwide", "0", {.rom = true}};
/*
@@ -58,9 +60,8 @@ cvar_t r_lightmapwide = {"r_lightmapwide","0",CVAR_ROM};
GL_Overbright_f -- johnfitz
====================
*/
static void GL_Overbright_f (cvar_t *var)
{
R_RebuildAllLightmaps ();
static void GL_Overbright_f(convar *var) {
R_RebuildAllLightmaps();
}
/*
@@ -68,9 +69,8 @@ static void GL_Overbright_f (cvar_t *var)
GL_Fullbrights_f -- johnfitz
====================
*/
static void GL_Fullbrights_f (cvar_t *var)
{
TexMgr_ReloadNobrightImages ();
static void GL_Fullbrights_f(convar *var) {
TexMgr_ReloadNobrightImages();
}
/*
@@ -78,14 +78,13 @@ static void GL_Fullbrights_f (cvar_t *var)
R_SetClearColor_f -- johnfitz
====================
*/
static void R_SetClearColor_f (cvar_t *var)
{
byte *rgb;
int s;
static void R_SetClearColor_f(convar *var) {
byte *rgb;
int s;
s = (int)r_clearcolor.value & 0xFF;
rgb = (byte*)(d_8to24table + s);
glClearColor (rgb[0]/255.0,rgb[1]/255.0,rgb[2]/255.0,0);
s = (int) r_clearcolor.value & 0xFF;
rgb = (byte *) (d_8to24table + s);
glClearColor(rgb[0] / 255.0, rgb[1] / 255.0, rgb[2] / 255.0, 0);
}
/*
@@ -93,11 +92,10 @@ static void R_SetClearColor_f (cvar_t *var)
R_Model_ExtraFlags_List_f -- johnfitz -- called when r_nolerp_list or r_noshadow_list cvar changes
===============
*/
static void R_Model_ExtraFlags_List_f (cvar_t *var)
{
int i;
for (i=0; i < MAX_MODELS; i++)
Mod_SetExtraFlags (cl.model_precache[i]);
static void R_Model_ExtraFlags_List_f(convar *var) {
int i;
for (i = 0; i < MAX_MODELS; i++)
Mod_SetExtraFlags(cl.model_precache[i]);
}
/*
@@ -105,9 +103,8 @@ static void R_Model_ExtraFlags_List_f (cvar_t *var)
R_SetWateralpha_f -- ericw
====================
*/
static void R_SetWateralpha_f (cvar_t *var)
{
map_wateralpha = var->value;
static void R_SetWateralpha_f(convar *var) {
map_wateralpha = var->value;
}
/*
@@ -115,9 +112,8 @@ static void R_SetWateralpha_f (cvar_t *var)
R_SetLavaalpha_f -- ericw
====================
*/
static void R_SetLavaalpha_f (cvar_t *var)
{
map_lavaalpha = var->value;
static void R_SetLavaalpha_f(convar *var) {
map_lavaalpha = var->value;
}
/*
@@ -125,9 +121,8 @@ static void R_SetLavaalpha_f (cvar_t *var)
R_SetTelealpha_f -- ericw
====================
*/
static void R_SetTelealpha_f (cvar_t *var)
{
map_telealpha = var->value;
static void R_SetTelealpha_f(convar *var) {
map_telealpha = var->value;
}
/*
@@ -135,9 +130,8 @@ static void R_SetTelealpha_f (cvar_t *var)
R_SetSlimealpha_f -- ericw
====================
*/
static void R_SetSlimealpha_f (cvar_t *var)
{
map_slimealpha = var->value;
static void R_SetSlimealpha_f(convar *var) {
map_slimealpha = var->value;
}
/*
@@ -145,16 +139,15 @@ static void R_SetSlimealpha_f (cvar_t *var)
GL_WaterAlphaForSurfface -- ericw
====================
*/
float GL_WaterAlphaForSurface (msurface_t *fa)
{
if (fa->flags & SURF_DRAWLAVA)
return map_lavaalpha > 0 ? map_lavaalpha : map_wateralpha;
else if (fa->flags & SURF_DRAWTELE)
return map_telealpha > 0 ? map_telealpha : map_wateralpha;
else if (fa->flags & SURF_DRAWSLIME)
return map_slimealpha > 0 ? map_slimealpha : map_wateralpha;
else
return map_wateralpha;
float GL_WaterAlphaForSurface(msurface_t *fa) {
if (fa->flags & SURF_DRAWLAVA)
return map_lavaalpha > 0 ? map_lavaalpha : map_wateralpha;
else if (fa->flags & SURF_DRAWTELE)
return map_telealpha > 0 ? map_telealpha : map_wateralpha;
else if (fa->flags & SURF_DRAWSLIME)
return map_slimealpha > 0 ? map_slimealpha : map_wateralpha;
else
return map_wateralpha;
}
@@ -163,79 +156,78 @@ float GL_WaterAlphaForSurface (msurface_t *fa)
R_Init
===============
*/
void R_Init (void)
{
Cmd_AddCommand ("timerefresh", R_TimeRefresh_f);
Cmd_AddCommand ("pointfile", R_ReadPointFile_f);
void R_Init(void) {
command::add("timerefresh", R_TimeRefresh_f);
command::add("pointfile", R_ReadPointFile_f);
Cvar_RegisterVariable (&r_norefresh);
Cvar_RegisterVariable (&r_lightmap);
Cvar_RegisterVariable (&r_fullbright);
Cvar_RegisterVariable (&r_drawentities);
Cvar_RegisterVariable (&r_drawviewmodel);
Cvar_RegisterVariable (&r_shadows);
Cvar_RegisterVariable (&r_wateralpha);
Cvar_SetCallback (&r_wateralpha, R_SetWateralpha_f);
Cvar_RegisterVariable (&r_litwater);
Cvar_RegisterVariable (&r_dynamic);
Cvar_RegisterVariable (&r_novis);
Cvar_RegisterVariable (&r_speeds);
Cvar_RegisterVariable (&r_pos);
r_norefresh.inscribe();
r_lightmap.inscribe();
r_fullbright.inscribe();
r_drawentities.inscribe();
r_drawviewmodel.inscribe();
r_shadows.inscribe();
r_wateralpha.inscribe();
r_wateralpha.set_callback(R_SetWateralpha_f);
r_litwater.inscribe();
r_dynamic.inscribe();
r_novis.inscribe();
r_speeds.inscribe();
r_pos.inscribe();
Cvar_RegisterVariable (&gl_finish);
Cvar_RegisterVariable (&gl_clear);
Cvar_RegisterVariable (&gl_cull);
Cvar_RegisterVariable (&gl_smoothmodels);
Cvar_RegisterVariable (&gl_affinemodels);
Cvar_RegisterVariable (&gl_polyblend);
Cvar_RegisterVariable (&gl_flashblend);
Cvar_RegisterVariable (&gl_playermip);
Cvar_RegisterVariable (&gl_nocolors);
gl_finish.inscribe();
gl_clear.inscribe();
gl_cull.inscribe();
gl_smoothmodels.inscribe();
gl_affinemodels.inscribe();
gl_polyblend.inscribe();
gl_flashblend.inscribe();
gl_playermip.inscribe();
gl_nocolors.inscribe();
//johnfitz -- new cvars
Cvar_RegisterVariable (&r_stereo);
Cvar_RegisterVariable (&r_stereodepth);
Cvar_RegisterVariable (&r_clearcolor);
Cvar_SetCallback (&r_clearcolor, R_SetClearColor_f);
Cvar_RegisterVariable (&r_waterquality);
Cvar_RegisterVariable (&r_oldwater);
Cvar_RegisterVariable (&r_waterwarp);
Cvar_RegisterVariable (&r_drawflat);
Cvar_RegisterVariable (&r_flatlightstyles);
Cvar_RegisterVariable (&r_oldskyleaf);
Cvar_RegisterVariable (&r_drawworld);
Cvar_RegisterVariable (&r_showtris);
Cvar_RegisterVariable (&r_showbboxes);
Cvar_RegisterVariable (&gl_farclip);
Cvar_RegisterVariable (&gl_fullbrights);
Cvar_RegisterVariable (&gl_overbright);
Cvar_SetCallback (&gl_fullbrights, GL_Fullbrights_f);
Cvar_SetCallback (&gl_overbright, GL_Overbright_f);
Cvar_RegisterVariable (&gl_overbright_models);
Cvar_RegisterVariable (&r_lerpmodels);
Cvar_RegisterVariable (&r_lerpmove);
Cvar_RegisterVariable (&r_nolerp_list);
Cvar_SetCallback (&r_nolerp_list, R_Model_ExtraFlags_List_f);
Cvar_RegisterVariable (&r_noshadow_list);
Cvar_SetCallback (&r_noshadow_list, R_Model_ExtraFlags_List_f);
//johnfitz
Cvar_RegisterVariable (&r_lightmapwide);
Cvar_SetROM ("r_lightmapwide", gl_packed_pixels ? "1" : "0");
//johnfitz -- new cvars
r_stereo.inscribe();
r_stereodepth.inscribe();
r_clearcolor.inscribe();
r_clearcolor.set_callback(R_SetClearColor_f);
r_waterquality.inscribe();
r_oldwater.inscribe();
r_waterwarp.inscribe();
r_drawflat.inscribe();
r_flatlightstyles.inscribe();
r_oldskyleaf.inscribe();
r_drawworld.inscribe();
r_showtris.inscribe();
r_showbboxes.inscribe();
gl_farclip.inscribe();
gl_fullbrights.inscribe();
gl_overbright.inscribe();
gl_fullbrights.set_callback(GL_Fullbrights_f);
gl_overbright.set_callback(GL_Overbright_f);
gl_overbright_models.inscribe();
r_lerpmodels.inscribe();
r_lerpmove.inscribe();
r_nolerp_list.inscribe();
r_nolerp_list.set_callback(R_Model_ExtraFlags_List_f);
r_noshadow_list.inscribe();
r_noshadow_list.set_callback(R_Model_ExtraFlags_List_f);
//johnfitz
r_lightmapwide.inscribe();
convar::set_rom("r_lightmapwide", gl_packed_pixels ? "1" : "0");
Cvar_RegisterVariable (&gl_zfix); // QuakeSpasm z-fighting fix
Cvar_RegisterVariable (&r_lavaalpha);
Cvar_RegisterVariable (&r_telealpha);
Cvar_RegisterVariable (&r_slimealpha);
Cvar_RegisterVariable (&r_scale);
Cvar_SetCallback (&r_lavaalpha, R_SetLavaalpha_f);
Cvar_SetCallback (&r_telealpha, R_SetTelealpha_f);
Cvar_SetCallback (&r_slimealpha, R_SetSlimealpha_f);
gl_zfix.inscribe(); // QuakeSpasm z-fighting fix
r_lavaalpha.inscribe();
r_telealpha.inscribe();
r_slimealpha.inscribe();
r_scale.inscribe();
r_lavaalpha.set_callback(R_SetLavaalpha_f);
r_telealpha.set_callback(R_SetTelealpha_f);
r_slimealpha.set_callback(R_SetSlimealpha_f);
R_InitParticles ();
R_SetClearColor_f (&r_clearcolor); //johnfitz
R_InitParticles();
R_SetClearColor_f(&r_clearcolor); //johnfitz
Sky_Init (); //johnfitz
Fog_Init (); //johnfitz
Sky_Init(); //johnfitz
Fog_Init(); //johnfitz
}
/*
@@ -243,19 +235,17 @@ void R_Init (void)
R_TranslatePlayerSkin -- johnfitz -- rewritten. also, only handles new colors, not new skins
===============
*/
void R_TranslatePlayerSkin (int playernum)
{
int top, bottom;
void R_TranslatePlayerSkin(int playernum) {
int top, bottom;
top = (cl.scores[playernum].colors & 0xf0)>>4;
bottom = cl.scores[playernum].colors &15;
top = (cl.scores[playernum].colors & 0xf0) >> 4;
bottom = cl.scores[playernum].colors & 15;
//FIXME: if gl_nocolors is on, then turned off, the textures may be out of sync with the scoreboard colors.
if (!gl_nocolors.value)
{
if (playertextures[playernum])
TexMgr_ReloadImage (playertextures[playernum], top, bottom);
}
//FIXME: if gl_nocolors is on, then turned off, the textures may be out of sync with the scoreboard colors.
if (!gl_nocolors.value) {
if (playertextures[playernum])
TexMgr_ReloadImage(playertextures[playernum], top, bottom);
}
}
/*
@@ -265,39 +255,40 @@ the skin or model actually changes, instead of just new colors
added bug fix from bengt jardup
===============
*/
void R_TranslateNewPlayerSkin (int playernum)
{
char name[64];
byte *pixels;
aliashdr_t *paliashdr;
int skinnum;
void R_TranslateNewPlayerSkin(int playernum) {
char name[64];
byte *pixels;
aliashdr_t *paliashdr;
int skinnum;
//get correct texture pixels
currententity = &cl_entities[1+playernum];
//get correct texture pixels
currententity = &cl_entities[1 + playernum];
if (!currententity->model || currententity->model->type != mod_alias)
return;
if (!currententity->model || currententity->model->type != mod_alias)
return;
paliashdr = (aliashdr_t *)Mod_Extradata (currententity->model);
paliashdr = (aliashdr_t *) Mod_Extradata(currententity->model);
skinnum = currententity->skinnum;
skinnum = currententity->skinnum;
//TODO: move these tests to the place where skinnum gets received from the server
if (skinnum < 0 || skinnum >= paliashdr->numskins)
{
Con_DPrintf("(%d): Invalid player skin #%d\n", playernum, skinnum);
skinnum = 0;
}
//TODO: move these tests to the place where skinnum gets received from the server
if (skinnum < 0 || skinnum >= paliashdr->numskins) {
Con_DPrintf("(%d): Invalid player skin #%d\n", playernum, skinnum);
skinnum = 0;
}
pixels = (byte *)paliashdr + paliashdr->texels[skinnum]; // This is not a persistent place!
pixels = (byte *) paliashdr + paliashdr->texels[skinnum]; // This is not a persistent place!
//upload new image
q_snprintf(name, sizeof(name), "player_%i", playernum);
playertextures[playernum] = TexMgr_LoadImage (currententity->model, name, paliashdr->skinwidth, paliashdr->skinheight,
SRC_INDEXED, pixels, paliashdr->gltextures[skinnum][0]->source_file, paliashdr->gltextures[skinnum][0]->source_offset, TEXPREF_PAD | TEXPREF_OVERWRITE);
//upload new image
q_snprintf(name, sizeof(name), "player_%i", playernum);
playertextures[playernum] = TexMgr_LoadImage(currententity->model, name, paliashdr->skinwidth,
paliashdr->skinheight,
SRC_INDEXED, pixels, paliashdr->gltextures[skinnum][0]->source_file,
paliashdr->gltextures[skinnum][0]->source_offset,
TEXPREF_PAD | TEXPREF_OVERWRITE);
//now recolor it
R_TranslatePlayerSkin (playernum);
//now recolor it
R_TranslatePlayerSkin(playernum);
}
/*
@@ -305,13 +296,12 @@ void R_TranslateNewPlayerSkin (int playernum)
R_NewGame -- johnfitz -- handle a game switch
===============
*/
void R_NewGame (void)
{
int i;
void R_NewGame(void) {
int i;
//clear playertexture pointers (the textures themselves were freed by texmgr_newgame)
for (i=0; i<MAX_SCOREBOARD; i++)
playertextures[i] = NULL;
//clear playertexture pointers (the textures themselves were freed by texmgr_newgame)
for (i = 0; i < MAX_SCOREBOARD; i++)
playertextures[i] = NULL;
}
/*
@@ -321,52 +311,61 @@ R_ParseWorldspawn
called at map load
=============
*/
static void R_ParseWorldspawn (void)
{
char key[128], value[4096];
const char *data;
static void R_ParseWorldspawn() {
map_wateralpha = r_wateralpha.value;
map_lavaalpha = r_lavaalpha.value;
map_telealpha = r_telealpha.value;
map_slimealpha = r_slimealpha.value;
map_wateralpha = r_wateralpha.value;
map_lavaalpha = r_lavaalpha.value;
map_telealpha = r_telealpha.value;
map_slimealpha = r_slimealpha.value;
std::string key{};
std::string value{};
std::istringstream ss{cl.worldmodel->entities};
data = COM_Parse(cl.worldmodel->entities);
if (!data)
return; // error
if (com_token[0] != '{')
return; // error
auto token = common::parse_token(ss);
if (!token.has_value())
return; // error
if ((*token)[0] != '{')
return; // error
while (1)
{
data = COM_Parse(data);
if (!data)
return; // error
if (com_token[0] == '}')
break; // end of worldspawn
if (com_token[0] == '_')
q_strlcpy(key, com_token + 1, sizeof(key));
else
q_strlcpy(key, com_token, sizeof(key));
while (key[0] && key[strlen(key)-1] == ' ') // remove trailing spaces
key[strlen(key)-1] = 0;
data = COM_ParseEx(data, CPE_ALLOWTRUNC);
if (!data)
return; // error
q_strlcpy(value, com_token, sizeof(value));
while (true) {
token = common::parse_token(ss);
if (!token.has_value()) {
return; // error
}
if ((*token)[0] == '}') {
break; // end of worldspawn
}
if ((*token)[0] == '_') {
key = token->substr(1);
} else {
key = *token;
}
while (!key.empty() && key.back() == ' ') {
// remove trailing spaces
key.pop_back();
}
token = common::parse_token(ss);
if (!token.has_value()) {
return; // error
}
value = *token;
if (!strcmp("wateralpha", key))
map_wateralpha = atof(value);
if (key == "wateralpha") {
map_wateralpha = std::strtof(value.c_str(), nullptr);
}
if (!strcmp("lavaalpha", key))
map_lavaalpha = atof(value);
if (key == "lavaalpha") {
map_lavaalpha = std::strtof(value.c_str(), nullptr);
}
if (!strcmp("telealpha", key))
map_telealpha = atof(value);
if (key == "telealpha") {
map_telealpha = std::strtof(value.c_str(), nullptr);
}
if (!strcmp("slimealpha", key))
map_slimealpha = atof(value);
}
if (key == "slimealpha") {
map_slimealpha = std::strtof(value.c_str(), nullptr);
}
}
}
@@ -375,33 +374,32 @@ static void R_ParseWorldspawn (void)
R_NewMap
===============
*/
void R_NewMap (void)
{
int i;
void R_NewMap(void) {
int i;
for (i=0 ; i<256 ; i++)
d_lightstylevalue[i] = 264; // normal light value
for (i = 0; i < 256; i++)
d_lightstylevalue[i] = 264; // normal light value
// clear out efrags in case the level hasn't been reloaded
// FIXME: is this one short?
for (i=0 ; i<cl.worldmodel->numleafs ; i++)
cl.worldmodel->leafs[i].efrags = NULL;
// clear out efrags in case the level hasn't been reloaded
// FIXME: is this one short?
for (i = 0; i < cl.worldmodel->numleafs; i++)
cl.worldmodel->leafs[i].efrags = NULL;
r_viewleaf = NULL;
R_ClearParticles ();
r_viewleaf = NULL;
R_ClearParticles();
GL_BuildLightmaps ();
GL_BuildBModelVertexBuffer ();
//ericw -- no longer load alias models into a VBO here, it's done in Mod_LoadAliasModel
GL_BuildLightmaps();
GL_BuildBModelVertexBuffer();
//ericw -- no longer load alias models into a VBO here, it's done in Mod_LoadAliasModel
r_framecount = 0; //johnfitz -- paranoid?
r_visframecount = 0; //johnfitz -- paranoid?
r_framecount = 0; //johnfitz -- paranoid?
r_visframecount = 0; //johnfitz -- paranoid?
Sky_NewMap (); //johnfitz -- skybox in worldspawn
Fog_NewMap (); //johnfitz -- global fog in worldspawn
R_ParseWorldspawn (); //ericw -- wateralpha, lavaalpha, telealpha, slimealpha in worldspawn
Sky_NewMap(); //johnfitz -- skybox in worldspawn
Fog_NewMap(); //johnfitz -- global fog in worldspawn
R_ParseWorldspawn(); //ericw -- wateralpha, lavaalpha, telealpha, slimealpha in worldspawn
load_subdivide_size = gl_subdivide_size.value; //johnfitz -- is this the right place to set this?
load_subdivide_size = gl_subdivide_size.value; //johnfitz -- is this the right place to set this?
}
/*
@@ -411,75 +409,67 @@ R_TimeRefresh_f
For program optimization
====================
*/
void R_TimeRefresh_f (void)
{
int i;
float start, stop, time;
void R_TimeRefresh_f(void) {
int i;
float start, stop, time;
if (cls.state != ca_connected)
{
Con_Printf("Not connected to a server\n");
return;
}
if (cls.state != ca_connected) {
Con_Printf("Not connected to a server\n");
return;
}
start = Sys_DoubleTime ();
for (i = 0; i < 128; i++)
{
GL_BeginRendering(&glx, &gly, &glwidth, &glheight);
r_refdef.viewangles[1] = i/128.0*360.0;
R_RenderView ();
GL_EndRendering ();
}
start = Sys_DoubleTime();
for (i = 0; i < 128; i++) {
GL_BeginRendering(&glx, &gly, &glwidth, &glheight);
r_refdef.viewangles[1] = i / 128.0 * 360.0;
R_RenderView();
GL_EndRendering();
}
glFinish ();
stop = Sys_DoubleTime ();
time = stop-start;
Con_Printf ("%f seconds (%f fps)\n", time, 128/time);
glFinish();
stop = Sys_DoubleTime();
time = stop - start;
Con_Printf("%f seconds (%f fps)\n", time, 128 / time);
}
void D_FlushCaches (void)
{
void D_FlushCaches(void) {
}
static GLuint gl_programs[16];
static int gl_num_programs;
static qboolean GL_CheckShader (GLuint shader)
{
GLint status;
GL_GetShaderivFunc (shader, GL_COMPILE_STATUS, &status);
static qboolean GL_CheckShader(GLuint shader) {
GLint status;
GL_GetShaderivFunc(shader, GL_COMPILE_STATUS, &status);
if (status != GL_TRUE)
{
char infolog[1024];
if (status != GL_TRUE) {
char infolog[1024];
memset(infolog, 0, sizeof(infolog));
GL_GetShaderInfoLogFunc (shader, sizeof(infolog), NULL, infolog);
memset(infolog, 0, sizeof(infolog));
GL_GetShaderInfoLogFunc(shader, sizeof(infolog), NULL, infolog);
Con_Warning ("GLSL program failed to compile: %s", infolog);
Con_Warning("GLSL program failed to compile: %s", infolog);
return false;
}
return true;
return false;
}
return true;
}
static qboolean GL_CheckProgram (GLuint program)
{
GLint status;
GL_GetProgramivFunc (program, GL_LINK_STATUS, &status);
static qboolean GL_CheckProgram(GLuint program) {
GLint status;
GL_GetProgramivFunc(program, GL_LINK_STATUS, &status);
if (status != GL_TRUE)
{
char infolog[1024];
if (status != GL_TRUE) {
char infolog[1024];
memset(infolog, 0, sizeof(infolog));
GL_GetProgramInfoLogFunc (program, sizeof(infolog), NULL, infolog);
memset(infolog, 0, sizeof(infolog));
GL_GetProgramInfoLogFunc(program, sizeof(infolog), NULL, infolog);
Con_Warning ("GLSL program failed to link: %s", infolog);
Con_Warning("GLSL program failed to link: %s", infolog);
return false;
}
return true;
return false;
}
return true;
}
/*
@@ -487,20 +477,18 @@ static qboolean GL_CheckProgram (GLuint program)
GL_GetUniformLocation
=============
*/
GLint GL_GetUniformLocation (GLuint *programPtr, const char *name)
{
GLint location;
GLint GL_GetUniformLocation(GLuint *programPtr, const char *name) {
GLint location;
if (!programPtr)
return -1;
if (!programPtr)
return -1;
location = GL_GetUniformLocationFunc(*programPtr, name);
if (location == -1)
{
Con_Warning("GL_GetUniformLocationFunc %s failed\n", name);
*programPtr = 0;
}
return location;
location = GL_GetUniformLocationFunc(*programPtr, name);
if (location == -1) {
Con_Warning("GL_GetUniformLocationFunc %s failed\n", name);
*programPtr = 0;
}
return location;
}
/*
@@ -510,61 +498,55 @@ GL_CreateProgram
Compiles and returns GLSL program.
====================
*/
GLuint GL_CreateProgram (const GLchar *vertSource, const GLchar *fragSource, int numbindings, const glsl_attrib_binding_t *bindings)
{
int i;
GLuint program, vertShader, fragShader;
GLuint GL_CreateProgram(const GLchar *vertSource, const GLchar *fragSource, int numbindings,
const glsl_attrib_binding_t *bindings) {
int i;
GLuint program, vertShader, fragShader;
if (!gl_glsl_able)
return 0;
if (!gl_glsl_able)
return 0;
vertShader = GL_CreateShaderFunc (GL_VERTEX_SHADER);
GL_ShaderSourceFunc (vertShader, 1, &vertSource, NULL);
GL_CompileShaderFunc (vertShader);
if (!GL_CheckShader (vertShader))
{
GL_DeleteShaderFunc (vertShader);
return 0;
}
vertShader = GL_CreateShaderFunc(GL_VERTEX_SHADER);
GL_ShaderSourceFunc(vertShader, 1, &vertSource, NULL);
GL_CompileShaderFunc(vertShader);
if (!GL_CheckShader(vertShader)) {
GL_DeleteShaderFunc(vertShader);
return 0;
}
fragShader = GL_CreateShaderFunc (GL_FRAGMENT_SHADER);
GL_ShaderSourceFunc (fragShader, 1, &fragSource, NULL);
GL_CompileShaderFunc (fragShader);
if (!GL_CheckShader (fragShader))
{
GL_DeleteShaderFunc (vertShader);
GL_DeleteShaderFunc (fragShader);
return 0;
}
fragShader = GL_CreateShaderFunc(GL_FRAGMENT_SHADER);
GL_ShaderSourceFunc(fragShader, 1, &fragSource, NULL);
GL_CompileShaderFunc(fragShader);
if (!GL_CheckShader(fragShader)) {
GL_DeleteShaderFunc(vertShader);
GL_DeleteShaderFunc(fragShader);
return 0;
}
program = GL_CreateProgramFunc ();
GL_AttachShaderFunc (program, vertShader);
GL_DeleteShaderFunc (vertShader);
GL_AttachShaderFunc (program, fragShader);
GL_DeleteShaderFunc (fragShader);
program = GL_CreateProgramFunc();
GL_AttachShaderFunc(program, vertShader);
GL_DeleteShaderFunc(vertShader);
GL_AttachShaderFunc(program, fragShader);
GL_DeleteShaderFunc(fragShader);
for (i = 0; i < numbindings; i++)
{
GL_BindAttribLocationFunc (program, bindings[i].attrib, bindings[i].name);
}
for (i = 0; i < numbindings; i++) {
GL_BindAttribLocationFunc(program, bindings[i].attrib, bindings[i].name);
}
GL_LinkProgramFunc (program);
GL_LinkProgramFunc(program);
if (!GL_CheckProgram (program))
{
GL_DeleteProgramFunc (program);
return 0;
}
else
{
if (gl_num_programs == Q_COUNTOF(gl_programs))
Host_Error ("gl_programs overflow");
if (!GL_CheckProgram(program)) {
GL_DeleteProgramFunc(program);
return 0;
} else {
if (gl_num_programs == Q_COUNTOF(gl_programs))
Host_Error("gl_programs overflow");
gl_programs[gl_num_programs] = program;
gl_num_programs++;
gl_programs[gl_num_programs] = program;
gl_num_programs++;
return program;
}
return program;
}
}
/*
@@ -574,19 +556,17 @@ R_DeleteShaders
Deletes any GLSL programs that have been created.
====================
*/
void R_DeleteShaders (void)
{
int i;
void R_DeleteShaders(void) {
int i;
if (!gl_glsl_able)
return;
if (!gl_glsl_able)
return;
for (i = 0; i < gl_num_programs; i++)
{
GL_DeleteProgramFunc (gl_programs[i]);
gl_programs[i] = 0;
}
gl_num_programs = 0;
for (i = 0; i < gl_num_programs; i++) {
GL_DeleteProgramFunc(gl_programs[i]);
gl_programs[i] = 0;
}
gl_num_programs = 0;
}
static GLuint current_array_buffer, current_element_array_buffer;
@@ -598,31 +578,28 @@ GL_BindBuffer
glBindBuffer wrapper
====================
*/
void GL_BindBuffer (GLenum target, GLuint buffer)
{
GLuint *cache;
void GL_BindBuffer(GLenum target, GLuint buffer) {
GLuint *cache;
if (!gl_vbo_able)
return;
if (!gl_vbo_able)
return;
switch (target)
{
case GL_ARRAY_BUFFER:
cache = &current_array_buffer;
break;
case GL_ELEMENT_ARRAY_BUFFER:
cache = &current_element_array_buffer;
break;
default:
Host_Error("GL_BindBuffer: unsupported target %d", (int)target);
return;
}
switch (target) {
case GL_ARRAY_BUFFER:
cache = &current_array_buffer;
break;
case GL_ELEMENT_ARRAY_BUFFER:
cache = &current_element_array_buffer;
break;
default:
Host_Error("GL_BindBuffer: unsupported target %d", (int) target);
return;
}
if (*cache != buffer)
{
*cache = buffer;
GL_BindBufferFunc (target, *cache);
}
if (*cache != buffer) {
*cache = buffer;
GL_BindBufferFunc(target, *cache);
}
}
/*
@@ -633,13 +610,12 @@ This must be called if you do anything that could make the cached bindings
invalid (e.g. manually binding, destroying the context).
====================
*/
void GL_ClearBufferBindings (void)
{
if (!gl_vbo_able)
return;
void GL_ClearBufferBindings(void) {
if (!gl_vbo_able)
return;
current_array_buffer = 0;
current_element_array_buffer = 0;
GL_BindBufferFunc (GL_ARRAY_BUFFER, 0);
GL_BindBufferFunc (GL_ELEMENT_ARRAY_BUFFER, 0);
current_array_buffer = 0;
current_element_array_buffer = 0;
GL_BindBufferFunc(GL_ARRAY_BUFFER, 0);
GL_BindBufferFunc(GL_ELEMENT_ARRAY_BUFFER, 0);
}