[cairo-commit] libglc/src glc.c,1.4,1.5 glc_texture.c,1.1.1.1,1.2

[David Reveman]

Committed by: davidr

Update of /cvs/cairo/libglc/src
In directory pdx:/tmp/cvs-serv9943/src

Modified Files:
	glc.c glc_texture.c 
Log Message:
Internal texture format fixed

Index: glc.c
===================================================================
RCS file: /cvs/cairo/libglc/src/glc.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** glc.c	3 Dec 2003 16:55:50 -0000	1.4
--- glc.c	3 Dec 2003 22:19:43 -0000	1.5
***************
*** 96,100 ****
  {
    glc_surface_t *intermediate = NULL, *mask_intermediate = NULL;
!   GLuint src_texture, texture = 0;
    double width_factor, height_factor;
    double tx1, tx2, ty1, ty2;
--- 96,100 ----
  {
    glc_surface_t *intermediate = NULL, *mask_intermediate = NULL;
!   GLuint src_texture = 0, texture = 0;
    double width_factor, height_factor;
    double tx1, tx2, ty1, ty2;

Index: glc_texture.c
===================================================================
RCS file: /cvs/cairo/libglc/src/glc_texture.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** glc_texture.c	27 Nov 2003 11:47:05 -0000	1.1.1.1
--- glc_texture.c	3 Dec 2003 22:19:43 -0000	1.2
***************
*** 60,64 ****
      GLint w_ok, h_ok;
  
!     glTexImage2D (GL_PROXY_TEXTURE_2D, 0, GL_RGBA4,
                    test_width, test_height,
                    0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
--- 60,64 ----
      GLint w_ok, h_ok;
  
!     glTexImage2D (GL_PROXY_TEXTURE_2D, 0, GL_RGBA8,
                    test_width, test_height,
                    0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
***************
*** 103,107 ****
      glBindTexture (GL_TEXTURE_2D, texture);
      
!     glTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA4,
                    *texture_width, *texture_height,
                    0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
--- 103,107 ----
      glBindTexture (GL_TEXTURE_2D, texture);
      
!     glTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA8,
                    *texture_width, *texture_height,
                    0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);