X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=gl_backend.h;h=32ede01995246f9105fbc83a945e3abd856e35fd;hp=c97fd14f6c6d57d0a62436ca42261f3c32c290ae;hb=f9d8bc7ea04ff91fcbd90fe50a299b37724b349b;hpb=b2a1ec8cb2a845e6440d0dbc5a9a84464f3deecc

diff --git a/gl_backend.h b/gl_backend.h
index c97fd14f..32ede019 100644
--- a/gl_backend.h
+++ b/gl_backend.h
@@ -2,7 +2,7 @@
 #ifndef GL_BACKEND_H
 #define GL_BACKEND_H
 
-#define MAX_TEXTUREUNITS 8
+#define MAX_TEXTUREUNITS 16
 
 #define POLYGONELEMENTS_MAXPOINTS 258
 extern int polygonelements[768];
@@ -20,21 +20,22 @@ 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(int num);
-void GL_ClientActiveTexture(int num);
+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_Clear(int mask);
 
+unsigned int GL_Backend_CompileProgram(int vertexstrings_count, const char **vertexstrings_list, int fragmentstrings_count, const char **fragmentstrings_list);
+void GL_Backend_FreeProgram(unsigned int prog);
+
 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
+typedef struct rmeshstate_s
 {
 	// textures
 	int tex1d[MAX_TEXTUREUNITS];
@@ -49,7 +50,8 @@ typedef struct
 	// matrices
 	matrix4x4_t texmatrix[MAX_TEXTUREUNITS];
 	// pointers
-	const float *pointer_texcoord[MAX_TEXTUREUNITS];
+	const float *pointer_texcoord[MAX_TEXTUREUNITS]; // 2D
+	const float *pointer_texcoord3f[MAX_TEXTUREUNITS]; // 3D
 
 	// other state set by this
 	const float *pointer_vertex;
@@ -67,23 +69,42 @@ void R_Mesh_Start(void);
 // (only valid after R_Mesh_Start)
 void R_Mesh_Finish(void);
 
-// sets up the requested transform matrix
+// sets up the requested vertex transform matrix
 void R_Mesh_Matrix(const matrix4x4_t *matrix);
-
-// set up the requested state
+// sets the vertex array pointer
+void R_Mesh_VertexPointer(const float *vertex3f);
+// sets the color array pointer (GL_Color only works when this is NULL)
+void R_Mesh_ColorPointer(const float *color4f);
+// sets the texcoord array pointer for an array unit
+void R_Mesh_TexCoordPointer(unsigned int unitnum, unsigned int numcomponents, const float *texcoord);
+// sets all textures bound to an image unit (multiple can be non-zero at once, according to OpenGL rules the highest one overrides the others)
+void R_Mesh_TexBindAll(unsigned int unitnum, int tex1d, int tex2d, int tex3d, int texcubemap);
+// sets these are like TexBindAll with only one of the texture indices non-zero
+// (binds one texture type and unbinds all other types)
+void R_Mesh_TexBind1D(unsigned int unitnum, int texnum);
+void R_Mesh_TexBind(unsigned int unitnum, int texnum);
+void R_Mesh_TexBind3D(unsigned int unitnum, int texnum);
+void R_Mesh_TexBindCubeMap(unsigned int unitnum, int texnum);
+// sets the texcoord matrix for a texenv unit
+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);
 
 // renders a mesh
-void R_Mesh_Draw(int numverts, int numtriangles, const int *elements);
+void R_Mesh_Draw(int firstvertex, int numvertices, int numtriangles, const int *elements);
 // renders a mesh as lines
-void R_Mesh_Draw_ShowTris(int numverts, int numtriangles, const int *elements);
+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, int x, int y, int width, int height, qboolean jpeg);
+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);
 // used by R_Envmap_f and internally in backend, clears the frame
 void R_ClearScreen(void);
 // invoke refresh of frame
 void SCR_UpdateScreen(void);
+// invoke refresh of loading plaque (nothing else seen)
+void SCR_UpdateLoadingScreen(void);
 
 // public structure
 typedef struct rcachearrayrequest_s
@@ -107,11 +128,14 @@ 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 float varray_normal3f[65536*3];
 extern int earray_element3i[65536];
+extern float varray_vertex3f2[65536*3];
 
 #endif