gave names to nearly all structs and enums which should make for better C++ error...

[xonotic/darkplaces.git] / gl_backend.h

diff --git a/gl_backend.h b/gl_backend.h
index e44c64c2bfae95b3007232a533fab8d28f97ae7f..32ede01995246f9105fbc83a945e3abd856e35fd 100644 (file)
--- a/gl_backend.h
+++ b/gl_backend.h
@@ -20,8 +20,8 @@ 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);
@@ -35,7 +35,7 @@ extern cvar_t gl_paranoid;
 extern cvar_t gl_printcheckerror;
 
 //input to R_Mesh_State
-typedef struct
+typedef struct rmeshstate_s
 {
        // textures
        int tex1d[MAX_TEXTUREUNITS];
@@ -78,13 +78,13 @@ 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, unsigned int tex1d, unsigned int tex2d, unsigned int tex3d, unsigned int texcubemap);
+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, unsigned int texnum);
-void R_Mesh_TexBind(unsigned int unitnum, unsigned int texnum);
-void R_Mesh_TexBind3D(unsigned int unitnum, unsigned int texnum);
-void R_Mesh_TexBindCubeMap(unsigned int unitnum, unsigned int texnum);
+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
@@ -93,12 +93,12 @@ void R_Mesh_TexCombine(unsigned int unitnum, int combinergb, int combinealpha, i
 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, qbyte *buffer1, qbyte *buffer2, qbyte *buffer3, int x, int y, int width, int height, qboolean flipx, qboolean flipy, qboolean flipdiagonal, 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