X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=r_textures.h;h=cf2c0f3f3fb9974f5da2dd28b2ee6ae47c5ee65c;hp=1e2b104416b2bd42f9bd1a2f9167b758a9c3c83b;hb=8fa52830c6ce238f3c06f1443e27ba250357af7b;hpb=5fd2c001d6a6927f57020d24d34cd2fcbc6c439e

diff --git a/r_textures.h b/r_textures.h
index 1e2b1044..cf2c0f3f 100644
--- a/r_textures.h
+++ b/r_textures.h
@@ -206,7 +206,8 @@ void R_FreeTexture(rtexture_t *rt);
 // update a portion of the image data of a texture, used by lightmap updates
 // and procedural textures such as video playback, actual uploads may be
 // delayed by gl_nopartialtextureupdates cvar until R_Mesh_TexBind uses it
-void R_UpdateTexture(rtexture_t *rt, const unsigned char *data, int x, int y, int z, int width, int height, int depth);
+// combine has 3 values: 0 = immediately upload (glTexSubImage2D), 1 = combine with other updates (glTexSubImage2D on next draw), 2 = combine with other updates and never upload partial images (glTexImage2D on next draw)
+void R_UpdateTexture(rtexture_t *rt, const unsigned char *data, int x, int y, int z, int width, int height, int depth, int combine);
 
 // returns the renderer dependent texture slot number (call this before each
 // use, as a texture might not have been precached)