eliminated qbyte type, now uses unsigned char throughout the engine for this purpose

[xonotic/darkplaces.git] / r_textures.h

diff --git a/r_textures.h b/r_textures.h
index 9cfaccc87d4325705c7005a1bb443e7d9f928605..44d574ead0b1b71fc9ccff172b235806818fb251 100644 (file)
--- a/r_textures.h
+++ b/r_textures.h
@@ -34,7 +34,7 @@
 #define TEXTYPE_DSDT 4
 
 // contents of this structure are mostly private to gl_textures.c
-typedef struct
+typedef struct rtexture_s
 {
        // this is exposed (rather than private) for speed reasons only
        int texnum;
@@ -42,7 +42,7 @@ typedef struct
 rtexture_t;
 
 // contents of this structure are private to gl_textures.c
-typedef struct
+typedef struct rtexturepool_s
 {
        int useless;
 }
@@ -61,17 +61,17 @@ int R_CompatibleFragmentWidth(int width, int textype, int flags);
 // add a texture to a pool and optionally precache (upload) it
 // (note: data == NULL is perfectly acceptable)
 // (note: palette must not be NULL if using TEXTYPE_PALETTE)
-rtexture_t *R_LoadTexture1D(rtexturepool_t *rtexturepool, const char *identifier, int width, const qbyte *data, int textype, int flags, const unsigned int *palette);
-rtexture_t *R_LoadTexture2D(rtexturepool_t *rtexturepool, const char *identifier, int width, int height, const qbyte *data, int textype, int flags, const unsigned int *palette);
-rtexture_t *R_LoadTexture3D(rtexturepool_t *rtexturepool, const char *identifier, int width, int height, int depth, const qbyte *data, int textype, int flags, const unsigned int *palette);
-rtexture_t *R_LoadTextureCubeMap(rtexturepool_t *rtexturepool, const char *identifier, int width, const qbyte *data, int textype, int flags, const unsigned int *palette);
+rtexture_t *R_LoadTexture1D(rtexturepool_t *rtexturepool, const char *identifier, int width, const unsigned char *data, int textype, int flags, const unsigned int *palette);
+rtexture_t *R_LoadTexture2D(rtexturepool_t *rtexturepool, const char *identifier, int width, int height, const unsigned char *data, int textype, int flags, const unsigned int *palette);
+rtexture_t *R_LoadTexture3D(rtexturepool_t *rtexturepool, const char *identifier, int width, int height, int depth, const unsigned char *data, int textype, int flags, const unsigned int *palette);
+rtexture_t *R_LoadTextureCubeMap(rtexturepool_t *rtexturepool, const char *identifier, int width, const unsigned char *data, int textype, int flags, const unsigned int *palette);
 
 // free a texture
 void R_FreeTexture(rtexture_t *rt);
 
 // update the image data of a texture, used by lightmap updates and
 // procedural textures.
-void R_UpdateTexture(rtexture_t *rt, qbyte *data);
+void R_UpdateTexture(rtexture_t *rt, unsigned char *data);
 
 // location of the fragment in the texture (note: any parameter except rt can
 // be NULL)