X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=gl_backend.h;h=e8918dc3f9f4c15c57b8b3d873a02776f639b0a3;hb=5cf8eacc9621cf85f9d0474e59289b13d083260f;hp=89f0a886024ead880c7376d567a026c5d7fb1244;hpb=224f9edae92441767654e2c10eb568bb91f86eb1;p=xonotic%2Fdarkplaces.git

diff --git a/gl_backend.h b/gl_backend.h
index 89f0a886..e8918dc3 100644
--- a/gl_backend.h
+++ b/gl_backend.h
@@ -7,47 +7,51 @@
 #define POLYGONELEMENTS_MAXPOINTS 258
 extern int polygonelements[768];
 
-void GL_SetupView_ViewPort (int x, int y, int width, int height);
-void GL_SetupView_Orientation_Identity (void);
-void GL_SetupView_Orientation_FromEntity (vec3_t origin, vec3_t angles);
-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_Ortho (double x1, double y1, double x2, double y2, double zNear, double zFar);
-void GL_UseColorArray(void);
+void GL_SetupView_ViewPort(int x, int y, int width, int height);
+void GL_SetupView_Orientation_Identity(void);
+void GL_SetupView_Orientation_FromEntity(vec3_t origin, vec3_t angles);
+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_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_VertexPointer(const float *p);
+void GL_ColorPointer(const float *p);
 void GL_Color(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(int num);
+void GL_ClientActiveTexture(int num);
 
 extern cvar_t gl_lockarrays;
+extern cvar_t gl_mesh_copyarrays;
+extern cvar_t gl_paranoid;
+extern cvar_t gl_printcheckerror;
 
 extern int c_meshelements, c_meshs;
 
 //input to R_Mesh_State
 typedef struct
 {
-	int depthwrite; // force depth writing enabled even if polygon is not opaque
-	int depthdisable; // disable depth read/write entirely
-	int blendfunc1;
-	int blendfunc2;
-	//int wantoverbright;
+	// textures
 	int tex1d[MAX_TEXTUREUNITS];
 	int tex[MAX_TEXTUREUNITS];
 	int tex3d[MAX_TEXTUREUNITS];
 	int texcubemap[MAX_TEXTUREUNITS];
+	// texture combine settings
 	int texrgbscale[MAX_TEXTUREUNITS]; // used only if COMBINE is present
 	int texalphascale[MAX_TEXTUREUNITS]; // used only if COMBINE is present
 	int texcombinergb[MAX_TEXTUREUNITS]; // works with or without combine for some operations
 	int texcombinealpha[MAX_TEXTUREUNITS]; // does nothing without combine
+	// pointers
+	const float *pointer_texcoord[MAX_TEXTUREUNITS];
 }
 rmeshstate_t;
 
 // overbright rendering scale for the current state
 extern int r_lightmapscalebit;
 extern float r_colorscale;
-extern float *varray_vertex3f;
-extern float *varray_color4f;
-extern float *varray_texcoord3f[MAX_TEXTUREUNITS];
-extern float *varray_texcoord2f[MAX_TEXTUREUNITS];
-extern int mesh_maxverts;
 
 // adds console variables and registers the render module (only call from GL_Init)
 void gl_backend_init(void);
@@ -62,33 +66,48 @@ void R_Mesh_Finish(void);
 // sets up the requested transform matrix
 void R_Mesh_Matrix(const matrix4x4_t *matrix);
 
-// sets up the requested state
-void R_Mesh_State(const rmeshstate_t *m);
-
-// sets up the requested main state
-void R_Mesh_MainState(const rmeshstate_t *m);
+// sets up the requested transform matrix
+void R_Mesh_TextureMatrix(int unitnumber, const matrix4x4_t *matrix);
 
-// sets up the requested texture state
-void R_Mesh_TextureState(const rmeshstate_t *m);
+// set up the requested state
+void R_Mesh_State_Texture(const rmeshstate_t *m);
 
-// prepares varray_* buffers for rendering a mesh
-void R_Mesh_GetSpace(int numverts);
-// renders the mesh in the varray_* buffers
+// renders a mesh
 void R_Mesh_Draw(int numverts, int numtriangles, const int *elements);
 
-// copies a vertex3f array into varray_vertex3f
-void R_Mesh_CopyVertex3f(const float *vertex3f, int numverts);
-// copies a texcoord2f array into varray_texcoord[tmu]
-void R_Mesh_CopyTexCoord2f(int tmu, const float *texcoord2f, int numverts);
-// copies a color4f array into varray_color4f
-void R_Mesh_CopyColor4f(const float *color4f, int numverts);
-
-// saves a section of the rendered frame to a .tga file
-qboolean SCR_ScreenShot(char *filename, int x, int y, int width, int height);
+// saves a section of the rendered frame to a .tga or .jpg file
+qboolean SCR_ScreenShot(char *filename, int x, int y, int width, int height, qboolean jpeg);
 // used by R_Envmap_f and internally in backend, clears the frame
 void R_ClearScreen(void);
 // invoke refresh of frame
-void SCR_UpdateScreen (void);
+void SCR_UpdateScreen(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_color4f[65536*4];
+extern float varray_texcoord2f[4][65536*2];
+extern float varray_texcoord3f[4][65536*3];
+extern float varray_normal3f[65536*3];
 
 #endif