X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=glquake.h;h=40b440635e576e5ec99d4770c43d72d615ca77fd;hb=69a21479a3466471cecff1eae841893028cb1da7;hp=89dc8c25659a3067f9f5cc7e4f13deb523d796f0;hpb=6a384398c93b7e2bc1936427797909eb60094160;p=xonotic%2Fdarkplaces.git

diff --git a/glquake.h b/glquake.h
index 89dc8c25..40b44063 100644
--- a/glquake.h
+++ b/glquake.h
@@ -8,7 +8,7 @@ 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.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -37,194 +37,121 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <GL/gl.h>
 //#include <GL/glu.h>
 
+extern qboolean isG200;
+extern qboolean isRagePro;
+
 extern void GL_BeginRendering (int *x, int *y, int *width, int *height);
 extern void GL_EndRendering (void);
 
-extern	int texture_extension_number;
-
 extern	float	gldepthmin, gldepthmax;
 
-extern void GL_Upload32 (void *data, int width, int height,  qboolean mipmap, qboolean alpha);
-extern void GL_Upload8 (byte *data, int width, int height,  qboolean mipmap, qboolean alpha);
-extern int GL_LoadTexture (char *identifier, int width, int height, byte *data, qboolean mipmap, qboolean alpha, int bytesperpixel);
-extern int GL_FindTexture (char *identifier);
-
-typedef struct
-{
-	float	x, y, z;
-	float	s, t;
-	float	r, g, b;
-} glvert_t;
-
-extern glvert_t glv;
-
-extern	int glx, gly, glwidth, glheight;
-
-// r_local.h -- private refresh defs
-
-#define ALIAS_BASE_SIZE_RATIO		(1.0 / 11.0)
-					// normalizing factor so player model works out to about
-					//  1 pixel per triangle
-#define	MAX_LBM_HEIGHT		480
-
-#define BACKFACE_EPSILON	0.01
-
-
-extern void R_TimeRefresh_f (void);
-
 //====================================================
 
-
-extern	entity_t	r_worldentity;
-extern	qboolean	r_cache_thrash;		// compatability
-extern	vec3_t		modelorg, r_entorigin;
-extern	entity_t	*currententity;
-extern	int			r_visframecount;	// ??? what difs?
-extern	int			r_framecount;
-extern	mplane_t	frustum[4];
-extern	int		c_brush_polys, c_alias_polys, c_light_polys, c_faces, c_nodes, c_leafs, c_models, c_bmodels, c_sprites, c_particles, c_dlights;
-
-
-//
-// view origin
-//
-extern	vec3_t	vup;
-extern	vec3_t	vpn;
-extern	vec3_t	vright;
-extern	vec3_t	r_origin;
-
-//
-// screen size info
-//
-extern	refdef_t	r_refdef;
-extern	mleaf_t		*r_viewleaf, *r_oldviewleaf;
-extern	texture_t	*r_notexture_mip;
-extern	unsigned short	d_lightstylevalue[256];	// 8.8 fraction of base light value
-
-extern	qboolean	envmap;
-
-extern	int	skytexturenum;		// index in cl.loadmodel, not gl texture object
-
-extern	cvar_t	r_drawentities;
-extern	cvar_t	r_drawviewmodel;
-extern	cvar_t	r_speeds;
-extern	cvar_t	r_fullbright;
-extern	cvar_t	r_shadows;
-extern	cvar_t	r_wateralpha;
-extern	cvar_t	r_dynamic;
-extern	cvar_t	r_novis;
-extern	cvar_t	r_waterripple;
-
-extern	cvar_t	gl_max_size;
-
-extern	float	r_world_matrix[16];
-
 extern	const char *gl_vendor;
 extern	const char *gl_renderer;
 extern	const char *gl_version;
 extern	const char *gl_extensions;
 
-// Multitexture
-#define    TEXTURE0_SGIS				0x835E
-#define    TEXTURE1_SGIS				0x835F
-
 #ifndef _WIN32
 #define APIENTRY /* */
 #endif
 
-extern qboolean gl_mtexable;
-
-// LordHavoc: ARB multitexure support
-extern int		gl_mtex_enum;
-
 // for platforms (wgl) that do not use GLAPIENTRY
 #ifndef GLAPIENTRY
 #define GLAPIENTRY APIENTRY
 #endif
 
-// Micro$oft dropped GL support beyond 1.1, so...
-#ifdef WIN32
-
-//#define GL_POLYGON_OFFSET_POINT			0x2A01
-//#define GL_POLYGON_OFFSET_LINE			0x2A02
-//#define GL_POLYGON_OFFSET_FILL			0x8037
-
+// GL_ARB_multitexture
+extern int gl_textureunits;
+extern void (GLAPIENTRY *qglMultiTexCoord2f) (GLenum, GLfloat, GLfloat);
+extern void (GLAPIENTRY *qglActiveTexture) (GLenum);
+extern void (GLAPIENTRY *qglClientActiveTexture) (GLenum);
+#ifndef GL_ACTIVE_TEXTURE_ARB
 #define GL_ACTIVE_TEXTURE_ARB			0x84E0
 #define GL_CLIENT_ACTIVE_TEXTURE_ARB	0x84E1
-#define GL_MAX_TEXTURES_UNITS_ARB		0x84E2
+#define GL_MAX_TEXTURE_UNITS_ARB		0x84E2
 #define GL_TEXTURE0_ARB					0x84C0
 #define GL_TEXTURE1_ARB					0x84C1
 #define GL_TEXTURE2_ARB					0x84C2
 #define GL_TEXTURE3_ARB					0x84C3
-// LordHavoc: ARB supports 32+ texture units, but hey I only use 2 anyway...
-
-// LordHavoc: vertex array defines
-#define GL_VERTEX_ARRAY					0x8074
-#define GL_NORMAL_ARRAY					0x8075
-#define GL_COLOR_ARRAY					0x8076
-#define GL_TEXTURE_COORD_ARRAY			0x8078
-
-//extern void (GLAPIENTRY *qglPolygonOffset)(GLfloat factor, GLfloat units);
-extern void (GLAPIENTRY *qglVertexPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr);
-//extern void (GLAPIENTRY *qglNormalPointer)(GLenum type, GLsizei stride, const GLvoid *ptr);
-extern void (GLAPIENTRY *qglColorPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr);
-extern void (GLAPIENTRY *qglTexCoordPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr);
-extern void (GLAPIENTRY *qglArrayElement)(GLint i);
-//extern void (GLAPIENTRY *qglDrawArrays)(GLenum mode, GLint first, GLsizei count);
-extern void (GLAPIENTRY *qglDrawElements)(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices);
-
-extern void (GLAPIENTRY *qglMTexCoord2f) (GLenum, GLfloat, GLfloat);
-extern void (GLAPIENTRY *qglSelectTexture) (GLenum);
-//extern void (GLAPIENTRY *glColorTableEXT)(int, int, int, int, int, const void*);
+#define GL_TEXTURE4_ARB					0x84C4
+#define GL_TEXTURE5_ARB					0x84C5
+#define GL_TEXTURE6_ARB					0x84C6
+#define GL_TEXTURE7_ARB					0x84C7
+#define GL_TEXTURE8_ARB					0x84C8
+#define GL_TEXTURE9_ARB					0x84C9
+#define GL_TEXTURE10_ARB				0x84CA
+#define GL_TEXTURE11_ARB				0x84CB
+#define GL_TEXTURE12_ARB				0x84CC
+#define GL_TEXTURE13_ARB				0x84CD
+#define GL_TEXTURE14_ARB				0x84CE
+#define GL_TEXTURE15_ARB				0x84CF
+#define GL_TEXTURE16_ARB				0x84D0
+#define GL_TEXTURE17_ARB				0x84D1
+#define GL_TEXTURE18_ARB				0x84D2
+#define GL_TEXTURE19_ARB				0x84D3
+#define GL_TEXTURE20_ARB				0x84D4
+#define GL_TEXTURE21_ARB				0x84D5
+#define GL_TEXTURE22_ARB				0x84D6
+#define GL_TEXTURE23_ARB				0x84D7
+#define GL_TEXTURE24_ARB				0x84D8
+#define GL_TEXTURE25_ARB				0x84D9
+#define GL_TEXTURE26_ARB				0x84DA
+#define GL_TEXTURE27_ARB				0x84DB
+#define GL_TEXTURE28_ARB				0x84DC
+#define GL_TEXTURE29_ARB				0x84DD
+#define GL_TEXTURE30_ARB				0x84DE
+#define GL_TEXTURE31_ARB				0x84DF
+#endif
 
-#else
+// GL_EXT_compiled_vertex_array
+extern int gl_supportslockarrays;
+extern void (GLAPIENTRY *qglLockArraysEXT) (GLint first, GLint count);
+extern void (GLAPIENTRY *qglUnlockArraysEXT) (void);
+
+// GL_ARB_texture_env_combine
+extern int gl_combine_extension;
+#ifndef GL_COMBINE_ARB
+#define GL_COMBINE_ARB					0x8570
+#define GL_COMBINE_RGB_ARB				0x8571
+#define GL_COMBINE_ALPHA_ARB			0x8572
+#define GL_SOURCE0_RGB_ARB				0x8580
+#define GL_SOURCE1_RGB_ARB				0x8581
+#define GL_SOURCE2_RGB_ARB				0x8582
+#define GL_SOURCE0_ALPHA_ARB			0x8588
+#define GL_SOURCE1_ALPHA_ARB			0x8589
+#define GL_SOURCE2_ALPHA_ARB			0x858A
+#define GL_OPERAND0_RGB_ARB				0x8590
+#define GL_OPERAND1_RGB_ARB				0x8591
+#define GL_OPERAND2_RGB_ARB				0x8592
+#define GL_OPERAND0_ALPHA_ARB			0x8598
+#define GL_OPERAND1_ALPHA_ARB			0x8599
+#define GL_OPERAND2_ALPHA_ARB			0x859A
+#define GL_RGB_SCALE_ARB				0x8573
+#define GL_ADD_SIGNED_ARB				0x8574
+#define GL_INTERPOLATE_ARB				0x8575
+#define GL_SUBTRACT_ARB					0x84E7
+#define GL_CONSTANT_ARB					0x8576
+#define GL_PRIMARY_COLOR_ARB			0x8577
+#define GL_PREVIOUS_ARB					0x8578
+#endif
 
-//#define qglPolygonOffset glPolygonOffset
-#define qglVertexPointer glVertexPointer
-//#define qglNormalPointer glNormalPointer
-#define qglColorPointer glColorPointer
-#define qglTexCoordPointer glTexCoordPointer
-#define qglArrayElement glArrayElement
-//#define qglDrawArrays glDrawArrays
-#define qglDrawElements glDrawElements
-
-extern void (GLAPIENTRY *qglMTexCoord2f) (GLenum, GLfloat, GLfloat);
-extern void (GLAPIENTRY *qglSelectTexture) (GLenum);
+extern cvar_t gl_combine;
+
+#ifdef WIN32
+#else
 //#ifndef MESA
 //extern void (GLAPIENTRY *glColorTableEXT)(int, int, int, int, int, const void*);
 //#endif
 
 #endif
 
-// LordHavoc: vertex transform
-#include "transform.h"
-
-// LordHavoc: transparent polygon system
-#include "gl_poly.h"
-
-#define gl_solid_format 3
-#define gl_alpha_format 4
-
-//#define PARANOID
-
-// LordHavoc: was a major time waster
-#define R_CullBox(mins,maxs) (frustum[0].BoxOnPlaneSideFunc(mins, maxs, &frustum[0]) == 2 || frustum[1].BoxOnPlaneSideFunc(mins, maxs, &frustum[1]) == 2 || frustum[2].BoxOnPlaneSideFunc(mins, maxs, &frustum[2]) == 2 || frustum[3].BoxOnPlaneSideFunc(mins, maxs, &frustum[3]) == 2)
-#define R_NotCulledBox(mins,maxs) (frustum[0].BoxOnPlaneSideFunc(mins, maxs, &frustum[0]) != 2 && frustum[1].BoxOnPlaneSideFunc(mins, maxs, &frustum[1]) != 2 && frustum[2].BoxOnPlaneSideFunc(mins, maxs, &frustum[2]) != 2 && frustum[3].BoxOnPlaneSideFunc(mins, maxs, &frustum[3]) != 2)
-
-extern qboolean fogenabled;
-extern vec3_t fogcolor;
-extern vec_t fogdensity;
-//#define calcfog(v) (exp(-(fogdensity*fogdensity*(((v)[0] - r_refdef.vieworg[0]) * vpn[0] + ((v)[1] - r_refdef.vieworg[1]) * vpn[1] + ((v)[2] - r_refdef.vieworg[2]) * vpn[2])*(((v)[0] - r_refdef.vieworg[0]) * vpn[0] + ((v)[1] - r_refdef.vieworg[1]) * vpn[1] + ((v)[2] - r_refdef.vieworg[2]) * vpn[2]))))
-#define calcfog(v) (exp(-(fogdensity*fogdensity*(((v)[0] - r_refdef.vieworg[0])*((v)[0] - r_refdef.vieworg[0])+((v)[1] - r_refdef.vieworg[1])*((v)[1] - r_refdef.vieworg[1])+((v)[2] - r_refdef.vieworg[2])*((v)[2] - r_refdef.vieworg[2])))))
-#define calcfogbyte(v) ((byte) (bound(0, ((int) ((float) (calcfog((v)) * 255.0f))), 255)))
+//#define DEBUGGL
 
-#include "r_modules.h"
-
-extern cvar_t gl_vertexarrays;
-extern qboolean lighthalf;
-
-extern void R_DrawAliasModel (entity_t *ent, int cull, float alpha, model_t *clmodel, int frame, int skin, vec3_t org, int effects, int flags, int colormap);
-
-extern cvar_t r_render;
-extern cvar_t r_upload;
-#include "image.h"
+#ifdef DEBUGGL
+#define CHECKGLERROR if ((errornumber = glGetError())) GL_PrintError(errornumber, __FILE__, __LINE__);
+extern int errornumber;
+void GL_PrintError(int errornumber, char *filename, int linenumber);
+#else
+#define CHECKGLERROR
+#endif