1.1 --- a/src/display.h	Sun Jun 18 11:57:55 2006 +0000
     1.2 +++ b/src/display.h	Thu Jan 25 13:03:23 2007 +0000
     1.3 @@ -1,5 +1,5 @@
     1.4  /**
     1.5 - * $Id: display.h,v 1.2 2006-06-18 11:57:55 nkeynes Exp $
     1.6 + * $Id: display.h,v 1.3 2007-01-25 11:46:35 nkeynes Exp $
     1.7   *
     1.8   * The PC side of the video support (responsible for actually displaying / 
     1.9   * rendering frames)
    1.10 @@ -22,6 +22,7 @@
    1.11  
    1.12  #include <stdint.h>
    1.13  #include <glib.h>
    1.14 +#include <GL/gl.h>
    1.15  
    1.16  #ifdef __cplusplus
    1.17  extern "C" {
    1.18 @@ -31,14 +32,21 @@
    1.19   * Supported colour formats. Note that ARGB4444 is only ever used for texture
    1.20   * rendering (it's not valid for display purposes).
    1.21   */
    1.22 +#define COLFMT_ARGB1555  0
    1.23  #define COLFMT_RGB565    1
    1.24 -#define COLFMT_RGB888    4
    1.25 -#define COLFMT_ARGB1555  0
    1.26 -#define COLFMT_ARGB8888  5
    1.27  #define COLFMT_ARGB4444  2
    1.28  #define COLFMT_YUV422    3 /* 8-bit YUV (texture source only) */
    1.29 +#define COLFMT_RGB888    4 /* 24-bit RGB */
    1.30 +#define COLFMT_ARGB8888  5
    1.31  #define COLFMT_INDEX4    6 /* 4 bit indexed colour (texture source only) */
    1.32  #define COLFMT_INDEX8    7 /* 8-bit indexed colour (texture source only) */
    1.33 +#define COLFMT_RGB0888   8 /* 32-bit RGB */
    1.34 +
    1.35 +struct colour_format {
    1.36 +    GLint type, format, int_format;
    1.37 +    int bpp;
    1.38 +};
    1.39 +extern struct colour_format colour_formats[];
    1.40  
    1.41  extern int colour_format_bytes[];
    1.42