X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=gl_backend.h;h=9a9be6762787b40249358d7965d0e8a5c4739d7c;hb=950178bb27b243c35614b0f0a9c586fe6b8cb28e;hp=73d317db503d38ba30f2d18c1d426d4b88b2780a;hpb=0405f2ece13064e683ed19b0d2ba71094f99448c;p=xonotic%2Fdarkplaces.git

diff --git a/gl_backend.h b/gl_backend.h
index 73d317db..9a9be676 100644
--- a/gl_backend.h
+++ b/gl_backend.h
@@ -5,25 +5,27 @@
 #define MAX_TEXTUREUNITS 16
 
 #define POLYGONELEMENTS_MAXPOINTS 258
-extern int polygonelements[768];
+extern int polygonelements[(POLYGONELEMENTS_MAXPOINTS-2)*3];
+#define QUADELEMENTS_MAXQUADS 128
+extern int quadelements[QUADELEMENTS_MAXQUADS*6];
 
 void GL_SetupView_Orientation_Identity(void);
 void GL_SetupView_Orientation_FromEntity(matrix4x4_t *matrix);
-void GL_SetupView_Mode_Perspective(double fovx, double fovy, double zNear, double zFar);
-void GL_SetupView_Mode_PerspectiveInfiniteFarClip(double fovx, double fovy, double zNear);
+void GL_SetupView_Mode_Perspective(double frustumx, double frustumy, double zNear, double zFar);
+void GL_SetupView_Mode_PerspectiveInfiniteFarClip(double frustumx, double frustumy, double zNear);
 void GL_SetupView_Mode_Ortho(double x1, double y1, double x2, double y2, double zNear, double zFar);
 void GL_BlendFunc(int blendfunc1, int blendfunc2);
 void GL_DepthMask(int state);
 void GL_DepthTest(int state);
+void GL_AlphaTest(int state);
 void GL_ColorMask(int r, int g, int b, int a);
 void GL_Color(float cr, float cg, float cb, float ca);
-void GL_ShowTrisColor(float cr, float cg, float cb, float ca);
 void GL_TransformToScreen(const vec4_t in, vec4_t out);
 void GL_LockArrays(int first, int count);
 void GL_ActiveTexture(unsigned int num);
 void GL_ClientActiveTexture(unsigned int num);
-void GL_Scissor(int x, int y, int width, int height); // AK for DRAWQUEUE_SETCLIP
-void GL_ScissorTest(int state);	// AK for DRAWQUEUE_(RE)SETCLIP
+void GL_Scissor(int x, int y, int width, int height);
+void GL_ScissorTest(int state);
 void GL_Clear(int mask);
 
 unsigned int GL_Backend_CompileProgram(int vertexstrings_count, const char **vertexstrings_list, int fragmentstrings_count, const char **fragmentstrings_list);
@@ -34,8 +36,8 @@ extern cvar_t gl_mesh_copyarrays;
 extern cvar_t gl_paranoid;
 extern cvar_t gl_printcheckerror;
 
-//input to R_Mesh_State
-typedef struct
+//input to R_Mesh_TextureState
+typedef struct rmeshstate_s
 {
 	// textures
 	int tex1d[MAX_TEXTUREUNITS];
@@ -52,10 +54,6 @@ typedef struct
 	// pointers
 	const float *pointer_texcoord[MAX_TEXTUREUNITS]; // 2D
 	const float *pointer_texcoord3f[MAX_TEXTUREUNITS]; // 3D
-
-	// other state set by this
-	const float *pointer_vertex;
-	const float *pointer_color;
 }
 rmeshstate_t;
 
@@ -89,8 +87,10 @@ void R_Mesh_TexBindCubeMap(unsigned int unitnum, int texnum);
 void R_Mesh_TexMatrix(unsigned int unitnum, const matrix4x4_t *matrix);
 // sets the combine state for a texenv unit
 void R_Mesh_TexCombine(unsigned int unitnum, int combinergb, int combinealpha, int rgbscale, int alphascale);
-// set up the requested entire rendering state
-void R_Mesh_State(const rmeshstate_t *m);
+// set up the requested texture state
+void R_Mesh_TextureState(const rmeshstate_t *m);
+// set up a blank texture state (faster/easier specialized version of R_Mesh_TextureState)
+void R_Mesh_ResetTextureState(void);
 
 // renders a mesh
 void R_Mesh_Draw(int firstvertex, int numvertices, int numtriangles, const int *elements);
@@ -98,7 +98,7 @@ void R_Mesh_Draw(int firstvertex, int numvertices, int numtriangles, const int *
 void R_Mesh_Draw_ShowTris(int firstvertex, int numvertices, int numtriangles, const int *elements);
 
 // saves a section of the rendered frame to a .tga or .jpg file
-qboolean SCR_ScreenShot(char *filename, qbyte *buffer1, qbyte *buffer2, qbyte *buffer3, int x, int y, int width, int height, qboolean flipx, qboolean flipy, qboolean flipdiagonal, qboolean jpeg, qboolean gammacorrect);
+qboolean SCR_ScreenShot(char *filename, unsigned char *buffer1, unsigned char *buffer2, unsigned char *buffer3, int x, int y, int width, int height, qboolean flipx, qboolean flipy, qboolean flipdiagonal, qboolean jpeg, qboolean gammacorrect);
 // used by R_Envmap_f and internally in backend, clears the frame
 void R_ClearScreen(void);
 // invoke refresh of frame
@@ -106,36 +106,5 @@ void SCR_UpdateScreen(void);
 // invoke refresh of loading plaque (nothing else seen)
 void SCR_UpdateLoadingScreen(void);
 
-// public structure
-typedef struct rcachearrayrequest_s
-{
-	// for use by the code that is requesting the array, these are not
-	// directly used but merely compared to determine if cache items are
-	// identical
-	const void *id_pointer1;
-	const void *id_pointer2;
-	const void *id_pointer3;
-	int id_number1;
-	int id_number2;
-	int id_number3;
-	// size of array data
-	int data_size;
-	// array data pointer
-	void *data;
-}
-rcachearrayrequest_t;
-
-int R_Mesh_CacheArray(rcachearrayrequest_t *r);
-
-extern float varray_vertex3f[65536*3];
-extern float varray_svector3f[65536*3];
-extern float varray_tvector3f[65536*3];
-extern float varray_normal3f[65536*3];
-extern float varray_color4f[65536*4];
-extern float varray_texcoord2f[4][65536*2];
-extern float varray_texcoord3f[4][65536*3];
-extern int earray_element3i[65536];
-extern float varray_vertex3f2[65536*3];
-
 #endif