1.1 --- a/src/display.c	Thu Jan 25 12:55:31 2007 +0000
     1.2 +++ b/src/display.c	Thu Jan 25 13:03:23 2007 +0000
     1.3 @@ -1,5 +1,5 @@
     1.4  /**
     1.5 - * $Id: display.c,v 1.4 2007-01-25 11:46:35 nkeynes Exp $
     1.6 + * $Id: display.c,v 1.5 2007-01-25 13:03:23 nkeynes Exp $
     1.7   *
     1.8   * Generic support for keyboard and other input sources. The active display
     1.9   * driver is expected to deliver events here, where they're translated and
    1.10 @@ -34,7 +34,7 @@
    1.11   * Colour format information
    1.12   */
    1.13  struct colour_format colour_formats[] = {
    1.14 -    { GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_RGBA, GL_RGB5_A1, 2 },
    1.15 +    { GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_BGRA, GL_RGB5_A1, 2 },
    1.16      { GL_UNSIGNED_SHORT_5_6_5, GL_RGB, GL_RGB5, 2 },
    1.17      { GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_BGRA, GL_RGBA4, 2 },
    1.18      { GL_UNSIGNED_INT_8_8_8_8_REV, GL_BGRA, GL_RGBA8, 4 }, /* YUV decoded to ARGB8888 */

     2.1 --- a/src/pvr2/texcache.c	Thu Jan 25 12:55:31 2007 +0000
     2.2 +++ b/src/pvr2/texcache.c	Thu Jan 25 13:03:23 2007 +0000
     2.3 @@ -1,5 +1,5 @@
     2.4  /**
     2.5 - * $Id: texcache.c,v 1.22 2007-01-25 12:55:31 nkeynes Exp $
     2.6 + * $Id: texcache.c,v 1.23 2007-01-25 13:03:23 nkeynes Exp $
     2.7   *
     2.8   * Texture cache. Responsible for maintaining a working set of OpenGL 
     2.9   * textures. 
    2.10 @@ -311,7 +311,7 @@
    2.11  	switch( MMIO_READ( PVR2, RENDER_PALETTE ) & 0x03 ) {
    2.12  	case 0: /* ARGB1555 */
    2.13  	    intFormat = GL_RGB5_A1;
    2.14 -	    format = GL_RGBA;
    2.15 +	    format = GL_BGRA;
    2.16  	    type = GL_UNSIGNED_SHORT_1_5_5_5_REV;
    2.17  	    break;
    2.18  	case 1:  /* RGB565 */
    2.19 @@ -335,7 +335,7 @@
    2.20  	    
    2.21      case PVR2_TEX_FORMAT_ARGB1555:
    2.22  	intFormat = GL_RGB5_A1;
    2.23 -	format = GL_RGBA;
    2.24 +	format = GL_BGRA;
    2.25  	type = GL_UNSIGNED_SHORT_1_5_5_5_REV;
    2.26  	break;
    2.27      case PVR2_TEX_FORMAT_RGB565: