[cairo-commit] glitz/src glitz.h, 1.1.1.1, 1.2 glitz_agl_surface.c, 1.1.1.1, 1.2 glitz_glx_context.c, 1.1.1.1, 1.2 glitz_glx_extension.c, 1.1.1.1, 1.2 glitz_glx_pbuffer.c, 1.1.1.1, 1.2 glitz_glx_surface.c, 1.1.1.1, 1.2 glitz_glxext.h, 1.1.1.1, 1.2 glitz_glxint.h, 1.1.1.1, 1.2 glitz_surface.c, 1.1.1.1, 1.2 glitzint.h, 1.2, 1.3

David Reveman commit at pdx.freedesktop.org
Sat Apr 3 09:53:57 PST 2004


Committed by: davidr

Update of /cvs/cairo/glitz/src
In directory pdx:/tmp/cvs-serv31113/src

Modified Files:
	glitz.h glitz_agl_surface.c glitz_glx_context.c 
	glitz_glx_extension.c glitz_glx_pbuffer.c glitz_glx_surface.c 
	glitz_glxext.h glitz_glxint.h glitz_surface.c glitzint.h 
Log Message:
Removed ATI_render_texture support

Index: glitz.h
===================================================================
RCS file: /cvs/cairo/glitz/src/glitz.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** a/glitz.h	30 Mar 2004 17:07:19 -0000	1.1.1.1
--- b/glitz.h	3 Apr 2004 17:53:54 -0000	1.2
***************
*** 145,149 ****
  #define GLITZ_FEATURE_ARB_VERTEX_PROGRAM_MASK      (1L << 7)
  #define GLITZ_FEATURE_ARB_FRAGMENT_PROGRAM_MASK    (1L << 8)
- #define GLITZ_FEATURE_ATI_RENDER_TEXTURE_MASK      (1L << 9)
  
  typedef enum {  
--- 145,148 ----

Index: glitz_agl_surface.c
===================================================================
RCS file: /cvs/cairo/glitz/src/glitz_agl_surface.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** a/glitz_agl_surface.c	30 Mar 2004 17:07:19 -0000	1.1.1.1
--- b/glitz_agl_surface.c	3 Apr 2004 17:53:54 -0000	1.2
***************
*** 150,156 ****
         &texture_indirections);
  
!     /* Convolution filter programs require support for at least six
         texture indirections. */
!     if (texture_indirections >= 5)
        surface->base.feature_mask |= GLITZ_FEATURE_CONVOLUTION_FILTER_MASK;
    }
--- 150,156 ----
         &texture_indirections);
  
!     /* Convolution filter programs require support for at least nine
         texture indirections. */
!     if (texture_indirections >= 9)
        surface->base.feature_mask |= GLITZ_FEATURE_CONVOLUTION_FILTER_MASK;
    }

Index: glitz_glx_context.c
===================================================================
RCS file: /cvs/cairo/glitz/src/glitz_glx_context.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** a/glitz_glx_context.c	30 Mar 2004 17:07:18 -0000	1.1.1.1
--- b/glitz_glx_context.c	3 Apr 2004 17:53:54 -0000	1.2
***************
*** 151,160 ****
  glitz_glx_context_proc_address_lookup (glitz_glx_context_t *context)
  {
!   context->glx.bind_tex_image_ati =
!     (glitz_glx_bind_tex_image_ati_t)
!     glitz_glx_get_proc_address ("glXBindTexImageATI");
!   context->glx.release_tex_image_ati =
!     (glitz_glx_release_tex_image_ati_t)
!     glitz_glx_get_proc_address ("glXReleaseTexImageATI");
  
    context->gl.active_texture_arb =
--- 151,160 ----
  glitz_glx_context_proc_address_lookup (glitz_glx_context_t *context)
  {
!   context->glx.bind_tex_image_arb =
!     (glitz_glx_bind_tex_image_arb_t)
!     glitz_glx_get_proc_address ("glXBindTexImageARB");
!   context->glx.release_tex_image_arb =
!     (glitz_glx_release_tex_image_arb_t)
!     glitz_glx_get_proc_address ("glXReleaseTexImageARB");
  
    context->gl.active_texture_arb =

Index: glitz_glx_extension.c
===================================================================
RCS file: /cvs/cairo/glitz/src/glitz_glx_extension.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** a/glitz_glx_extension.c	30 Mar 2004 17:07:18 -0000	1.1.1.1
--- b/glitz_glx_extension.c	3 Apr 2004 17:53:54 -0000	1.2
***************
*** 35,39 ****
  
  static glitz_extension_map client_glx_extensions[] = {
!   { "GLX_ATI_render_texture", GLITZ_GLX_FEATURE_ATI_RENDER_TEXTURE_MASK },
    { "GLX_ARB_multisample", GLITZ_GLX_FEATURE_CLIENT_MULTISAMPLE_MASK },
    { NULL, 0 }
--- 35,41 ----
  
  static glitz_extension_map client_glx_extensions[] = {
!   /* NYI: Don't know of any driver that supports GLX_ARB_render_texture 
!     { "GLX_ARB_render_texture", GLITZ_GLX_FEATURE_ARB_RENDER_TEXTURE_MASK },
!    */
    { "GLX_ARB_multisample", GLITZ_GLX_FEATURE_CLIENT_MULTISAMPLE_MASK },
    { NULL, 0 }
***************
*** 121,132 ****
  
    if (screen_info->glx_feature_mask &
!       GLITZ_GLX_FEATURE_ATI_RENDER_TEXTURE_MASK) {
!     screen_info->glx_feature_mask |= GLITZ_GLX_FEATURE_ATI_RENDER_TEXTURE_MASK;
!     screen_info->feature_mask |= GLITZ_FEATURE_ATI_RENDER_TEXTURE_MASK;
! 
!     /* ATI render texture doesn't seem to support texture rectangle */
!     screen_info->texture_mask &= ~GLITZ_TEXTURE_TARGET_RECTANGLE_MASK;
!     screen_info->feature_mask &= ~GLITZ_FEATURE_TEXTURE_RECTANGLE_MASK;
!   }
  
    if (screen_info->glx_feature_mask &
--- 123,128 ----
  
    if (screen_info->glx_feature_mask &
!       GLITZ_GLX_FEATURE_ARB_RENDER_TEXTURE_MASK)
!     screen_info->glx_feature_mask |= GLITZ_GLX_FEATURE_ARB_RENDER_TEXTURE_MASK;
  
    if (screen_info->glx_feature_mask &

Index: glitz_glx_pbuffer.c
===================================================================
RCS file: /cvs/cairo/glitz/src/glitz_glx_pbuffer.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** a/glitz_glx_pbuffer.c	30 Mar 2004 17:07:18 -0000	1.1.1.1
--- b/glitz_glx_pbuffer.c	3 Apr 2004 17:53:54 -0000	1.2
***************
*** 37,42 ****
  glitz_glx_pbuffer_create (Display *display,
                            GLXFBConfig fbconfig,
!                           glitz_texture_t *texture,
!                           glitz_bool_t render_texture)
  {
    int pbuffer_attr[13], i = 0;
--- 37,41 ----
  glitz_glx_pbuffer_create (Display *display,
                            GLXFBConfig fbconfig,
!                           glitz_texture_t *texture)
  {
    int pbuffer_attr[13], i = 0;
***************
*** 50,61 ****
    pbuffer_attr[i++] = GLX_LARGEST_PBUFFER;
    pbuffer_attr[i++] = 0;
- 
-   if (render_texture) {    
-     pbuffer_attr[i++] = GLX_TEXTURE_FORMAT_ATI;
-     pbuffer_attr[i++] = GLX_TEXTURE_RGBA_ATI;
-     pbuffer_attr[i++] = GLX_TEXTURE_TARGET_ATI;
-     pbuffer_attr[i++] = GLX_TEXTURE_2D_ATI;
-   }
- 
    pbuffer_attr[i++] = 0;
      
--- 49,52 ----

Index: glitz_glx_surface.c
===================================================================
RCS file: /cvs/cairo/glitz/src/glitz_glx_surface.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** a/glitz_glx_surface.c	30 Mar 2004 17:07:19 -0000	1.1.1.1
--- b/glitz_glx_surface.c	3 Apr 2004 17:53:54 -0000	1.2
***************
*** 57,70 ****
    glitz_glx_surface_t *surface = (glitz_glx_surface_t *) abstract_surface;
  
!   if (constraint == GLITZ_CN_SURFACE_DRAWABLE_CURRENT) {
!     if (surface->render_texture) {
!       surface->context->glx.release_tex_image_ati
!         (surface->screen_info->display_info->display, surface->pbuffer,
!          (surface->base.format->doublebuffer)?
!          GLX_BACK_LEFT_ATI: GLX_FRONT_LEFT_ATI);
!     }
!     if (!surface->drawable)
!       constraint = GLITZ_CN_ANY_CONTEXT_CURRENT;
!   }
    
    surface = glitz_glx_context_push_current (surface, constraint);
--- 57,62 ----
    glitz_glx_surface_t *surface = (glitz_glx_surface_t *) abstract_surface;
  
!   if (constraint == GLITZ_CN_SURFACE_DRAWABLE_CURRENT && (!surface->drawable))
!     constraint = GLITZ_CN_ANY_CONTEXT_CURRENT;
    
    surface = glitz_glx_context_push_current (surface, constraint);
***************
*** 124,140 ****
    if (!(surface->base.hint_mask & GLITZ_INT_HINT_DIRTY_MASK))
      return;
! 
!   if (surface->render_texture) {
!     glitz_texture_bind (surface->base.gl, surface->base.texture);
!     surface->context->glx.bind_tex_image_ati
!       (surface->screen_info->display_info->display, surface->pbuffer,
!        (surface->base.format->doublebuffer)?
!        GLX_BACK_LEFT_ATI: GLX_FRONT_LEFT_ATI);
!     
!     glitz_texture_unbind (surface->base.gl, surface->base.texture);
! 
!   } else
!     glitz_texture_copy_surface (surface->base.texture, &surface->base,
!                                 &surface->base.dirty_region);
  
    surface->base.hint_mask &= ~GLITZ_INT_HINT_DIRTY_MASK;
--- 116,122 ----
    if (!(surface->base.hint_mask & GLITZ_INT_HINT_DIRTY_MASK))
      return;
!   
!   glitz_texture_copy_surface (surface->base.texture, &surface->base,
!                               &surface->base.dirty_region);
  
    surface->base.hint_mask &= ~GLITZ_INT_HINT_DIRTY_MASK;
***************
*** 159,163 ****
    surface->base.feature_mask = surface->screen_info->feature_mask;
  
-   surface->base.feature_mask &= ~GLITZ_FEATURE_ATI_RENDER_TEXTURE_MASK;
    surface->base.feature_mask &= ~GLITZ_FEATURE_ARB_VERTEX_PROGRAM_MASK;
    surface->base.feature_mask &= ~GLITZ_FEATURE_ARB_FRAGMENT_PROGRAM_MASK;
--- 141,144 ----
***************
*** 171,180 ****
      glitz_surface_pop_current (&surface->base);
    }
!   
!   if ((surface->screen_info->feature_mask &
!        GLITZ_FEATURE_ATI_RENDER_TEXTURE_MASK) &&
!       surface->context->glx.bind_tex_image_ati &&
!       surface->context->glx.release_tex_image_ati)
!     surface->base.feature_mask |= GLITZ_FEATURE_ATI_RENDER_TEXTURE_MASK;
  
    if (surface->context->gl.active_texture_arb &&
--- 152,161 ----
      glitz_surface_pop_current (&surface->base);
    }
! 
!   if ((surface->screen_info->glx_feature_mask &
!        GLITZ_GLX_FEATURE_ARB_RENDER_TEXTURE_MASK) &&
!       surface->context->glx.bind_tex_image_arb &&
!       surface->context->glx.release_tex_image_arb)
!     surface->render_texture = 1;
  
    if (surface->context->gl.active_texture_arb &&
***************
*** 204,211 ****
           GLITZ_GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB,
           &texture_indirections);
!       
!       /* Convolution filter programs require support for at least six
           texture indirections. */
!       if (texture_indirections >= 5)
          surface->base.feature_mask |= GLITZ_FEATURE_CONVOLUTION_FILTER_MASK;
      }
--- 185,192 ----
           GLITZ_GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB,
           &texture_indirections);
! 
!       /* Convolution filter programs require support for at least nine
           texture indirections. */
!       if (texture_indirections >= 9)
          surface->base.feature_mask |= GLITZ_FEATURE_CONVOLUTION_FILTER_MASK;
      }
***************
*** 252,258 ****
    texture_format = glitz_get_gl_format_from_bpp (format->bpp);
  
-   if (screen_info->feature_mask & GLITZ_FEATURE_ATI_RENDER_TEXTURE_MASK)
-     surface->render_texture = 1;
-   
    glitz_surface_push_current (&surface->base, GLITZ_CN_ANY_CONTEXT_CURRENT);
  
--- 233,236 ----
***************
*** 272,287 ****
        glitz_glx_pbuffer_create (screen_info->display_info->display,
                                  surface->context->fbconfig,
!                                 surface->base.texture,
!                                 surface->render_texture);
  
    _glitz_glx_set_features (surface);
- 
-   if (surface->base.feature_mask & GLITZ_FEATURE_ATI_RENDER_TEXTURE_MASK) {
-     if (format->red_size || format->green_size || format->blue_size)
-       surface->base.hint_mask |= GLITZ_INT_HINT_REQUIRES_NO_FLIPPING_MASK;
-   } else
-     surface->render_texture = 0;
    
!   if ((!surface->render_texture) && (!surface->pbuffer))
      glitz_texture_allocate (surface->base.gl, surface->base.texture);
  
--- 250,258 ----
        glitz_glx_pbuffer_create (screen_info->display_info->display,
                                  surface->context->fbconfig,
!                                 surface->base.texture);
  
    _glitz_glx_set_features (surface);
    
!   if (!surface->pbuffer)
      glitz_texture_allocate (surface->base.gl, surface->base.texture);
  
***************
*** 385,395 ****
    glitz_surface_push_current (&surface->base, GLITZ_CN_ANY_CONTEXT_CURRENT);
  
-   if (surface->render_texture) {
-     surface->context->glx.release_tex_image_ati
-       (surface->screen_info->display_info->display, surface->pbuffer,
-        (surface->base.format->doublebuffer)?
-        GLX_BACK_LEFT_ATI: GLX_FRONT_LEFT_ATI);
-   }
-   
    if (surface->base.texture)
      glitz_texture_destroy (surface->base.gl, surface->base.texture);
--- 356,359 ----

Index: glitz_glxext.h
===================================================================
RCS file: /cvs/cairo/glitz/src/glitz_glxext.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** a/glitz_glxext.h	30 Mar 2004 17:07:19 -0000	1.1.1.1
--- b/glitz_glxext.h	3 Apr 2004 17:53:54 -0000	1.2
***************
*** 96,108 ****
  
  typedef GLXFBConfig *(* glitz_glx_get_fbconfigs_t)
!      (Display *, int, int *);
  typedef int (* glitz_glx_get_fbconfig_attrib_t)
!      (Display *, GLXFBConfig, int, int *);
  typedef XVisualInfo *(* glitz_glx_get_visual_from_fbconfig_t)
!      (Display *, GLXFBConfig);
  typedef GLXPbuffer (* glitz_glx_create_pbuffer_t)
!      (Display *, GLXFBConfig, const int *);
  typedef void (* glitz_glx_destroy_pbuffer_t)
!      (Display *, GLXPbuffer);
  
  #ifndef GLX_ARB_multisample
--- 96,108 ----
  
  typedef GLXFBConfig *(* glitz_glx_get_fbconfigs_t)
!      (Display *display, int screen, int *n_elements);
  typedef int (* glitz_glx_get_fbconfig_attrib_t)
!      (Display *display, GLXFBConfig config, int attribute, int *value);
  typedef XVisualInfo *(* glitz_glx_get_visual_from_fbconfig_t)
!      (Display *display, GLXFBConfig config);
  typedef GLXPbuffer (* glitz_glx_create_pbuffer_t)
!      (Display *display, GLXFBConfig config, const int *attrib_list);
  typedef void (* glitz_glx_destroy_pbuffer_t)
!      (Display *display, GLXPbuffer pbuffer);
  
  #ifndef GLX_ARB_multisample
***************
*** 111,156 ****
  #endif
  
! #ifndef GLX_ATI_render_texture
! #define GLX_BIND_TO_TEXTURE_RGB_ATI         0x9800
! #define GLX_BIND_TO_TEXTURE_RGBA_ATI        0x9801
! #define GLX_TEXTURE_FORMAT_ATI              0x9802
! #define GLX_TEXTURE_TARGET_ATI              0x9803
! #define GLX_MIPMAP_TEXTURE_ATI              0x9804
! #define GLX_TEXTURE_RGB_ATI                 0x9805
! #define GLX_TEXTURE_RGBA_ATI                0x9806
! #define GLX_NO_TEXTURE_ATI                  0x9807
! #define GLX_TEXTURE_CUBE_MAP_ATI            0x9808
! #define GLX_TEXTURE_1D_ATI                  0x9809
! #define GLX_TEXTURE_2D_ATI                  0x980A
! #define GLX_MIPMAP_LEVEL_ATI                0x980B
! #define GLX_CUBE_MAP_FACE_ATI               0x980C
! #define GLX_TEXTURE_CUBE_MAP_POSITIVE_X_ATI 0x980D
! #define GLX_TEXTURE_CUBE_MAP_NEGATIVE_X_ATI 0x980E
! #define GLX_TEXTURE_CUBE_MAP_POSITIVE_Y_ATI 0x980F
! #define GLX_TEXTURE_CUBE_MAP_NEGATIVE_Y_ATI 0x9810
! #define GLX_TEXTURE_CUBE_MAP_POSITIVE_Z_ATI 0x9811
! #define GLX_TEXTURE_CUBE_MAP_NEGATIVE_Z_ATI 0x9812
! #define GLX_FRONT_LEFT_ATI                  0x9813
! #define GLX_FRONT_RIGHT_ATI                 0x9814
! #define GLX_BACK_LEFT_ATI                   0x9815
! #define GLX_BACK_RIGHT_ATI                  0x9816
! #define GLX_AUX0_ATI                        0x9817
! #define GLX_AUX1_ATI                        0x9818
! #define GLX_AUX2_ATI                        0x9819
! #define GLX_AUX3_ATI                        0x981A
! #define GLX_AUX4_ATI                        0x981B
! #define GLX_AUX5_ATI                        0x981C
! #define GLX_AUX6_ATI                        0x981D
! #define GLX_AUX7_ATI                        0x981E
! #define GLX_AUX8_ATI                        0x981F
! #define GLX_AUX9_ATI                        0x9820
! #define GLX_BIND_TO_TEXTURE_LUMINANCE_ATI   0x9821
! #define GLX_BIND_TO_TEXTURE_INTENSITY_ATI   0x9822
! #endif
! 
! typedef void (* glitz_glx_bind_tex_image_ati_t)
!      (Display *, GLXPbuffer, int);
! typedef void (* glitz_glx_release_tex_image_ati_t)
!      (Display *, GLXPbuffer, int);
  
  #endif /* GLITZ_GLXEXT_H_INCLUDED */
--- 111,118 ----
  #endif
  
! typedef Bool *(* glitz_glx_bind_tex_image_arb_t)
!      (Display *display, GLXPbuffer pbuffer, int buffer);
! typedef Bool (* glitz_glx_release_tex_image_arb_t)
!      (Display *display, GLXPbuffer pbuffer, int buffer);
  
  #endif /* GLITZ_GLXEXT_H_INCLUDED */

Index: glitz_glxint.h
===================================================================
RCS file: /cvs/cairo/glitz/src/glitz_glxint.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** a/glitz_glxint.h	30 Mar 2004 17:07:19 -0000	1.1.1.1
--- b/glitz_glxint.h	3 Apr 2004 17:53:54 -0000	1.2
***************
*** 46,51 ****
  #define GLITZ_GLX_FEATURE_ARB_VERTEX_PROGRAM_MASK      (1L << 6)
  #define GLITZ_GLX_FEATURE_ARB_FRAGMENT_PROGRAM_MASK    (1L << 7)
! #define GLITZ_GLX_FEATURE_ATI_RENDER_TEXTURE_MASK      (1L << 8)
! #define GLITZ_GLX_FEATURE_GLX13_MASK                   (1L << 9)
  
  typedef struct _glitz_glx_surface glitz_glx_surface_t;
--- 46,51 ----
  #define GLITZ_GLX_FEATURE_ARB_VERTEX_PROGRAM_MASK      (1L << 6)
  #define GLITZ_GLX_FEATURE_ARB_FRAGMENT_PROGRAM_MASK    (1L << 7)
! #define GLITZ_GLX_FEATURE_GLX13_MASK                   (1L << 8)
! #define GLITZ_GLX_FEATURE_ARB_RENDER_TEXTURE_MASK      (1L << 9)
  
  typedef struct _glitz_glx_surface glitz_glx_surface_t;
***************
*** 63,68 ****
  
  typedef struct _glitz_glx_proc_address_list_t {
!   glitz_glx_bind_tex_image_ati_t bind_tex_image_ati;
!   glitz_glx_release_tex_image_ati_t release_tex_image_ati;
    glitz_bool_t supported;
  } glitz_glx_proc_address_list_t;
--- 63,68 ----
  
  typedef struct _glitz_glx_proc_address_list_t {
!   glitz_glx_bind_tex_image_arb_t bind_tex_image_arb;
!   glitz_glx_release_tex_image_arb_t release_tex_image_arb;
    glitz_bool_t supported;
  } glitz_glx_proc_address_list_t;
***************
*** 169,174 ****
  glitz_glx_pbuffer_create (Display *display,
                            GLXFBConfig fbconfig,
!                           glitz_texture_t *texture,
!                           glitz_bool_t render_texture);
  
  extern void __internal_linkage
--- 169,173 ----
  glitz_glx_pbuffer_create (Display *display,
                            GLXFBConfig fbconfig,
!                           glitz_texture_t *texture);
  
  extern void __internal_linkage

Index: glitz_surface.c
===================================================================
RCS file: /cvs/cairo/glitz/src/glitz_surface.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** a/glitz_surface.c	30 Mar 2004 17:07:19 -0000	1.1.1.1
--- b/glitz_surface.c	3 Apr 2004 17:53:54 -0000	1.2
***************
*** 622,628 ****
      surface->gl->disable (GLITZ_GL_DITHER);
      glitz_set_operator (surface->gl, GLITZ_OPERATOR_SRC);
! 
!     if (!SURFACE_REQUIRES_NO_FLIPPING(surface))
!       surface->gl->pixel_zoom (1.0, -1.0);
      
      _glitz_set_raster_pos (surface->gl, x, surface->height - y);
--- 622,627 ----
      surface->gl->disable (GLITZ_GL_DITHER);
      glitz_set_operator (surface->gl, GLITZ_OPERATOR_SRC);
!     
!     surface->gl->pixel_zoom (1.0, -1.0);
      
      _glitz_set_raster_pos (surface->gl, x, surface->height - y);

Index: glitzint.h
===================================================================
RCS file: /cvs/cairo/glitz/src/glitzint.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** a/glitzint.h	1 Apr 2004 19:30:44 -0000	1.2
--- b/glitzint.h	3 Apr 2004 17:53:54 -0000	1.3
***************
*** 270,275 ****
  #define GLITZ_INT_HINT_IMPLICIT_MASK_MASK        (1L << 5)
  #define GLITZ_INT_HINT_DIRTY_MASK                (1L << 6)
! #define GLITZ_INT_HINT_REQUIRES_NO_FLIPPING_MASK (1L << 7)
! #define GLITZ_INT_HINT_CLEAR_EXTERIOR_MASK       (1L << 8)
  
  #define SURFACE_PROGRAMMATIC(surface) \
--- 270,274 ----
  #define GLITZ_INT_HINT_IMPLICIT_MASK_MASK        (1L << 5)
  #define GLITZ_INT_HINT_DIRTY_MASK                (1L << 6)
! #define GLITZ_INT_HINT_CLEAR_EXTERIOR_MASK       (1L << 7)
  
  #define SURFACE_PROGRAMMATIC(surface) \
***************
*** 285,291 ****
    (surface->hint_mask & GLITZ_INT_HINT_DIRTY_MASK)
  
- #define SURFACE_REQUIRES_NO_FLIPPING(surface) \
-   (surface->hint_mask & GLITZ_INT_HINT_REQUIRES_NO_FLIPPING_MASK)
- 
  #define SURFACE_CLEAR_EXTERIOR(surface) \
    (surface->hint_mask & GLITZ_INT_HINT_CLEAR_EXTERIOR_MASK)
--- 284,287 ----





More information about the cairo-commit mailing list