[cairo-commit] glitz/src glitz.c,1.25,1.26

[David Reveman]

Committed by: davidr

Update of /cvs/cairo/glitz/src
In directory gabe:/tmp/cvs-serv25626/src

Modified Files:
	glitz.c 
Log Message:
Fixed texture wrap mode bug

Index: glitz.c
===================================================================
RCS file: /cvs/cairo/glitz/src/glitz.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** glitz.c	13 Sep 2004 17:50:38 -0000	1.25
--- glitz.c	15 Sep 2004 22:28:50 -0000	1.26
***************
*** 203,207 ****
          glitz_texture_ensure_wrap (gl, mtexture, GLITZ_GL_REPEAT);
      } else {
!       if (SURFACE_PAD (mask))
          glitz_texture_ensure_wrap (gl, mtexture, GLITZ_GL_CLAMP_TO_EDGE);
        else
--- 203,209 ----
          glitz_texture_ensure_wrap (gl, mtexture, GLITZ_GL_REPEAT);
      } else {
!       if ((!(dst->backend->feature_mask &
!              GLITZ_FEATURE_TEXTURE_BORDER_CLAMP_MASK)) ||
!           SURFACE_PAD (mask))
          glitz_texture_ensure_wrap (gl, mtexture, GLITZ_GL_CLAMP_TO_EDGE);
        else
***************
*** 248,252 ****
          glitz_texture_ensure_wrap (gl, stexture, GLITZ_GL_REPEAT);
      } else {
!       if (SURFACE_PAD (src))
          glitz_texture_ensure_wrap (gl, stexture, GLITZ_GL_CLAMP_TO_EDGE);
        else
--- 250,256 ----
          glitz_texture_ensure_wrap (gl, stexture, GLITZ_GL_REPEAT);
      } else {
!       if ((!(dst->backend->feature_mask &
!              GLITZ_FEATURE_TEXTURE_BORDER_CLAMP_MASK)) ||
!           SURFACE_PAD (src))
          glitz_texture_ensure_wrap (gl, stexture, GLITZ_GL_CLAMP_TO_EDGE);
        else
***************
*** 261,265 ****
  
    gl->push_matrix ();
!   
    glitz_geometry_enable (gl, dst, &primitive, &first, &count);
  
--- 265,269 ----
  
    gl->push_matrix ();
! 
    glitz_geometry_enable (gl, dst, &primitive, &first, &count);