X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=gl_backend.h;h=72acc7b2eb0bb311e31e432cc53f9c26a4fba6de;hb=c22ec98a144f18d7519eb4a06dd1ee8937e8c4ac;hp=89f0a886024ead880c7376d567a026c5d7fb1244;hpb=224f9edae92441767654e2c10eb568bb91f86eb1;p=xonotic%2Fdarkplaces.git

diff --git a/gl_backend.h b/gl_backend.h
index 89f0a886..72acc7b2 100644
--- a/gl_backend.h
+++ b/gl_backend.h
@@ -16,8 +16,10 @@ void GL_SetupView_Mode_Ortho (double x1, double y1, double x2, double y2, double
 void GL_UseColorArray(void);
 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);
 
 extern cvar_t gl_lockarrays;
+extern cvar_t gl_mesh_copyarrays;
 
 extern int c_meshelements, c_meshs;
 
@@ -37,6 +39,10 @@ typedef struct
 	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
+	int pointervertexcount;
+	float *pointer_vertex;
+	float *pointer_color;
+	float *pointer_texcoord[MAX_TEXTUREUNITS];
 }
 rmeshstate_t;
 
@@ -71,10 +77,14 @@ void R_Mesh_MainState(const rmeshstate_t *m);
 // sets up the requested texture state
 void R_Mesh_TextureState(const rmeshstate_t *m);
 
+// forcefully ends a batch (do this before calling any gl functions directly)
+void R_Mesh_EndBatch(void);
 // prepares varray_* buffers for rendering a mesh
 void R_Mesh_GetSpace(int numverts);
-// renders the mesh in the varray_* buffers
+// renders a mesh (optionally with batching)
 void R_Mesh_Draw(int numverts, int numtriangles, const int *elements);
+// renders a mesh without affecting batching
+void R_Mesh_Draw_NoBatching(int numverts, int numtriangles, const int *elements);
 
 // copies a vertex3f array into varray_vertex3f
 void R_Mesh_CopyVertex3f(const float *vertex3f, int numverts);
@@ -83,12 +93,33 @@ 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);
 
+// 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);
+
 #endif