fte
/
quakespasm
mirror of https://github.com/Shpoike/Quakespasm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dropped support for GL_SGIS_multitexture 

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@984 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
Ozkan Sezer 2014-08-30 08:00:34 +00:00
parent b9d280f10b
commit b8fc8caa0f
7 changed files with 18 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Quake/gl_sky.c
View File

@ -800,9 +800,9 @@ void Sky_DrawFaceQuad (glpoly_t *p)
for (i=0, v=p->verts[0] ; i<4 ; i++, v+=VERTEXSIZE)
{
Sky_GetTexCoord (v, 8, &s, &t);
GL_MTexCoord2fFunc (TEXTURE0, s, t);
GL_MTexCoord2fFunc (GL_TEXTURE0_ARB, s, t);
Sky_GetTexCoord (v, 16, &s, &t);
GL_MTexCoord2fFunc (TEXTURE1, s, t);
GL_MTexCoord2fFunc (GL_TEXTURE1_ARB, s, t);
glVertex3fv (v);
}
glEnd ();

9
Quake/gl_texmgr.c
View File

@ -1402,7 +1402,6 @@ void TexMgr_ReloadNobrightImages (void)
*/
static GLuint currenttexture = (GLuint)-1; // to avoid unnecessary texture sets
GLenum TEXTURE0, TEXTURE1; //johnfitz
qboolean mtexenabled = false;
/*
@ -1420,12 +1419,12 @@ static void GL_SelectTexture (GLenum target)
GL_SelectTextureFunc(target);
if (target == TEXTURE0)
if (target == GL_TEXTURE0_ARB)
{
ct1 = currenttexture;
currenttexture = ct0;
}
else //target == TEXTURE1
else //target == GL_TEXTURE1_ARB
{
ct0 = currenttexture;
currenttexture = ct1;
@ -1444,7 +1443,7 @@ void GL_DisableMultitexture(void)
if (mtexenabled)
{
glDisable(GL_TEXTURE_2D);
GL_SelectTexture(TEXTURE0); //johnfitz -- no longer SGIS specific
GL_SelectTexture(GL_TEXTURE0_ARB);
mtexenabled = false;
}
}
@ -1458,7 +1457,7 @@ void GL_EnableMultitexture(void)
{
if (gl_mtexable)
{
GL_SelectTexture(TEXTURE1); //johnfitz -- no longer SGIS specific
GL_SelectTexture(GL_TEXTURE1_ARB);
glEnable(GL_TEXTURE_2D);
mtexenabled = true;
}

24
Quake/gl_vidsdl.c
View File

@ -552,7 +552,6 @@ static void GL_CheckExtensions (void)
{
int swap_control;
//
// multitexture
//
if (COM_CheckParm("-nomtex"))
@ -564,24 +563,6 @@ static void GL_CheckExtensions (void)
if (GL_MTexCoord2fFunc && GL_SelectTextureFunc)
{
Con_Printf("FOUND: ARB_multitexture\n");
TEXTURE0 = GL_TEXTURE0_ARB;
TEXTURE1 = GL_TEXTURE1_ARB;
gl_mtexable = true;
}
else
{
Con_Warning ("Couldn't link to multitexture functions\n");
}
}
else if (GL_ParseExtensionList(gl_extensions, "GL_SGIS_multitexture"))
{
GL_MTexCoord2fFunc = (PFNGLMULTITEXCOORD2FARBPROC) SDL_GL_GetProcAddress("glMTexCoord2fSGIS");
GL_SelectTextureFunc = (PFNGLACTIVETEXTUREARBPROC) SDL_GL_GetProcAddress("glSelectTextureSGIS");
if (GL_MTexCoord2fFunc && GL_SelectTextureFunc)
{
Con_Printf("FOUND: SGIS_multitexture\n");
TEXTURE0 = TEXTURE0_SGIS;
TEXTURE1 = TEXTURE1_SGIS;
gl_mtexable = true;
}
else
@ -594,7 +575,6 @@ static void GL_CheckExtensions (void)
Con_Warning ("multitexture not supported (extension not found)\n");
}
//
// texture_env_combine
//
if (COM_CheckParm("-nocombine"))
@ -614,7 +594,6 @@ static void GL_CheckExtensions (void)
Con_Warning ("texture_env_combine not supported\n");
}
//
// texture_env_add
//
if (COM_CheckParm("-noadd"))
@ -634,7 +613,6 @@ static void GL_CheckExtensions (void)
Con_Warning ("texture_env_add not supported\n");
}
//
// swap control (the "after SDL_SetVideoMode" part)
//
if (!gl_swap_control)
@ -656,7 +634,6 @@ static void GL_CheckExtensions (void)
Con_Printf("FOUND: SDL_GL_SWAP_CONTROL\n");
}
//
// anisotropic filtering
//
if (GL_ParseExtensionList(gl_extensions, "GL_EXT_texture_filter_anisotropic"))
@ -699,7 +676,6 @@ static void GL_CheckExtensions (void)
Con_Warning ("texture_filter_anisotropic not supported\n");
}
//
// texture_non_power_of_two
//
if (COM_CheckParm("-notexturenpot"))

14
Quake/glquake.h
View File

@ -152,24 +152,17 @@ extern float r_world_matrix[16];
// Multitexture
extern qboolean mtexenabled;
extern qboolean gl_mtexable;
#define TEXTURE0_SGIS 0x835E
#define TEXTURE1_SGIS 0x835F
//johnfitz -- modified multitexture support
extern PFNGLMULTITEXCOORD2FARBPROC GL_MTexCoord2fFunc;
extern PFNGLACTIVETEXTUREARBPROC GL_SelectTextureFunc;
extern GLenum TEXTURE0, TEXTURE1;
//johnfitz
//johnfitz -- anisotropic filtering
#define GL_TEXTURE_MAX_ANISOTROPY_EXT 0x84FE
#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF
extern float gl_max_anisotropy;
extern qboolean gl_anisotropy_able;
//johnfitz
//ericw -- NPOT texture support
extern qboolean gl_texture_NPOT;
//ericw
//johnfitz -- polygon offset
#define OFFSET_BMODEL 1
@ -178,7 +171,6 @@ extern qboolean gl_texture_NPOT;
#define OFFSET_FOG -2
#define OFFSET_SHOWTRIS -3
void GL_PolygonOffset (int);
//johnfitz
//johnfitz -- GL_EXT_texture_env_combine
//the values for GL_ARB_ are identical
@ -195,13 +187,11 @@ void GL_PolygonOffset (int);
#define GL_SOURCE1_ALPHA_EXT 0x8589
extern qboolean gl_texture_env_combine;
extern qboolean gl_texture_env_add; // for GL_EXT_texture_env_add
//johnfitz
//johnfitz -- rendering statistics
extern int rs_brushpolys, rs_aliaspolys, rs_skypolys, rs_particles, rs_fogpolys;
extern int rs_dynamiclightmaps, rs_brushpasses, rs_aliaspasses, rs_skypasses;
extern float rs_megatexels;
//johnfitz
//johnfitz -- track developer statistics that vary every frame
extern cvar_t devstats;
@ -215,7 +205,6 @@ typedef struct {
int dlights;
} devstats_t;
extern devstats_t dev_stats, dev_peakstats;
//johnfitz
//ohnfitz -- reduce overflow warning spam
typedef struct {
@ -225,13 +214,11 @@ typedef struct {
} overflowtimes_t;
extern overflowtimes_t dev_overflows; //this stores the last time overflow messages were displayed, not the last time overflows occured
#define CONSOLE_RESPAM_TIME 3 // seconds between repeated warning messages
//johnfitz
//johnfitz -- moved here from r_brush.c
extern int gl_lightmap_format, lightmap_bytes;
#define MAX_LIGHTMAPS 256 //johnfitz -- was 64
extern gltexture_t *lightmap_textures[MAX_LIGHTMAPS]; //johnfitz -- changed to an array
//johnfitz
extern int gl_warpimagesize; //johnfitz -- for water warp
@ -248,7 +235,6 @@ void Fog_StopAdditive (void);
void Fog_SetupFrame (void);
void Fog_NewMap (void);
void Fog_Init (void);
//johnfitz
void R_NewGame (void);

10
Quake/r_alias.c
View File

@ -123,8 +123,8 @@ void GL_DrawAliasFrame (aliashdr_t *paliashdr, lerpdata_t lerpdata)
v = ((float *)commands)[1];
if (mtexenabled)
{
GL_MTexCoord2fFunc (TEXTURE0, u, v);
GL_MTexCoord2fFunc (TEXTURE1, u, v);
GL_MTexCoord2fFunc (GL_TEXTURE0_ARB, u, v);
GL_MTexCoord2fFunc (GL_TEXTURE1_ARB, u, v);
}
else
glTexCoord2f (u, v);
@ -404,7 +404,7 @@ void R_DrawAliasModel (entity_t *e)
//
// transform it
//
glPushMatrix ();
glPushMatrix ();
R_RotateForEntity (lerpdata.origin, lerpdata.angles);
glTranslatef (paliashdr->scale_origin[0], paliashdr->scale_origin[1], paliashdr->scale_origin[2]);
glScalef (paliashdr->scale[0], paliashdr->scale[1], paliashdr->scale[2]);
@ -675,7 +675,7 @@ void GL_DrawAliasShadow (entity_t *e)
lheight = currententity->origin[2] - lightspot[2];
// set up matrix
glPushMatrix ();
glPushMatrix ();
glTranslatef (lerpdata.origin[0], lerpdata.origin[1], lerpdata.origin[2]);
glTranslatef (0,0,-lheight);
glMultMatrixf (shadowmatrix);
@ -719,7 +719,7 @@ void R_DrawAliasModel_ShowTris (entity_t *e)
R_SetupAliasFrame (paliashdr, e->frame, &lerpdata);
R_SetupEntityTransform (e, &lerpdata);
glPushMatrix ();
glPushMatrix ();
R_RotateForEntity (lerpdata.origin,lerpdata.angles);
glTranslatef (paliashdr->scale_origin[0], paliashdr->scale_origin[1], paliashdr->scale_origin[2]);
glScalef (paliashdr->scale[0], paliashdr->scale[1], paliashdr->scale[2]);

8
Quake/r_brush.c
View File

@ -339,8 +339,8 @@ void R_DrawSequentialPoly (msurface_t *s)
v = s->polys->verts[0];
for (i=0 ; i<s->polys->numverts ; i++, v+= VERTEXSIZE)
{
GL_MTexCoord2fFunc (TEXTURE0, v[3], v[4]);
GL_MTexCoord2fFunc (TEXTURE1, v[5], v[6]);
GL_MTexCoord2fFunc (GL_TEXTURE0_ARB, v[3], v[4]);
GL_MTexCoord2fFunc (GL_TEXTURE1_ARB, v[5], v[6]);
glVertex3fv (v);
}
glEnd ();
@ -414,8 +414,8 @@ void R_DrawSequentialPoly (msurface_t *s)
v = s->polys->verts[0];
for (i=0 ; i<s->polys->numverts ; i++, v+= VERTEXSIZE)
{
GL_MTexCoord2fFunc (TEXTURE0, v[3], v[4]);
GL_MTexCoord2fFunc (TEXTURE1, v[5], v[6]);
GL_MTexCoord2fFunc (GL_TEXTURE0_ARB, v[3], v[4]);
GL_MTexCoord2fFunc (GL_TEXTURE1_ARB, v[5], v[6]);
glVertex3fv (v);
}
glEnd ();

6
Quake/r_world.c
View File

@ -443,15 +443,15 @@ void R_DrawTextureChains_Multitexture (qmodel_t *model, entity_t *ent, texchain_
v = s->polys->verts[0];
for (j=0 ; j<s->polys->numverts ; j++, v+= VERTEXSIZE)
{
GL_MTexCoord2fFunc (TEXTURE0, v[3], v[4]);
GL_MTexCoord2fFunc (TEXTURE1, v[5], v[6]);
GL_MTexCoord2fFunc (GL_TEXTURE0_ARB, v[3], v[4]);
GL_MTexCoord2fFunc (GL_TEXTURE1_ARB, v[5], v[6]);
glVertex3fv (v);
}
glEnd ();
rs_brushpasses++;
}
GL_DisableMultitexture(); // selects TEXTURE0
if (bound && t->texturechains[chain]->flags & SURF_DRAWFENCE)
glDisable (GL_ALPHA_TEST); // Flip alpha test back off
}