X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=gl_backend.h;h=60f5042ae929ca20faf29cb7940c3d67b491ad3a;hp=eac1e6d7a6237baf5bfc8965f7e794c351cf68df;hb=10bb1f0433fe2be39b0c9cdc23b30544020351c2;hpb=dbce962f09403fd5888d0bd858ceefc90bc3ea2b

diff --git a/gl_backend.h b/gl_backend.h
index eac1e6d7..60f5042a 100644
--- a/gl_backend.h
+++ b/gl_backend.h
@@ -4,56 +4,95 @@
 
 #define MAX_TEXTUREUNITS 8
 
-extern int c_meshtris, c_meshs, c_transtris, c_transmeshs;
+#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_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;
+
+//input to R_Mesh_State
 typedef struct
 {
-	//input to R_Mesh_Draw_GetBuffer
 	int depthwrite; // force depth writing enabled even if polygon is not opaque
 	int depthdisable; // disable depth read/write entirely
 	int blendfunc1;
 	int blendfunc2;
-	int numtriangles;
-	int numverts;
+	//int wantoverbright;
+	int tex1d[MAX_TEXTUREUNITS];
 	int tex[MAX_TEXTUREUNITS];
+	int tex3d[MAX_TEXTUREUNITS];
+	int texcubemap[MAX_TEXTUREUNITS];
 	int texrgbscale[MAX_TEXTUREUNITS]; // used only if COMBINE is present
-	matrix4x4_t matrix; // model to world transform matrix
-
-	// output
-	int *index;
-	float *vertex;
-	float *color;
-	float colorscale;
-	float *texcoords[MAX_TEXTUREUNITS];
+	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];
 }
-rmeshbufferinfo_t;
+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);
 
 // starts mesh rendering for the frame
-void R_Mesh_Start(float farclip);
+void R_Mesh_Start(void);
 
 // ends mesh rendering for the frame
 // (only valid after R_Mesh_Start)
 void R_Mesh_Finish(void);
 
-// clears depth buffer, used for masked sky rendering
-// (only valid between R_Mesh_Start and R_Mesh_Finish)
-void R_Mesh_ClearDepth(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 texture state
+void R_Mesh_TextureState(const rmeshstate_t *m);
 
-// renders current batch of meshs
-// (only valid between R_Mesh_Start and R_Mesh_Finish)
-void R_Mesh_Render(void);
+// 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
+void R_Mesh_Draw(int numverts, int numtriangles, const int *elements);
 
-// allocates space in geometry buffers, and fills in pointers to the buffers in passsed struct
-// (it is up to the caller to fill in the geometry data)
-// (make sure you scale your colors by the colorscale field)
-// (only valid between R_Mesh_Start and R_Mesh_Finish)
-int R_Mesh_Draw_GetBuffer(rmeshbufferinfo_t *m, int wantoverbright);
+// 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