[cairo-commit] libglc/src glc_glx_context.c,1.11,1.12 glc_glx_extension.c,1.10,1.11 glc_glx_format.c,1.15,1.16 glcint.h,1.19,1.20

[David Reveman]

Committed by: davidr

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

Modified Files:
	glc_glx_context.c glc_glx_extension.c glc_glx_format.c 
	glcint.h 
Log Message:
Fixed use of GLX 1.3 without pbuffer support

Index: glc_glx_context.c
===================================================================
RCS file: /cvs/cairo/libglc/src/glc_glx_context.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** a/glc_glx_context.c	20 Feb 2004 17:40:57 -0000	1.11
--- b/glc_glx_context.c	23 Feb 2004 22:38:14 -0000	1.12
***************
*** 133,137 ****
    screen_info->contexts[index] = context;
  
!   if (screen_info->feature_mask & GLC_FEATURE_OFFSCREEN_DRAWING_MASK)
      _glc_glx_context_create_glx13 (screen_info,
                                     screen_info->format_ids[format->id],
--- 133,137 ----
    screen_info->contexts[index] = context;
  
!   if (screen_info->glx_feature_mask & GLC_GLX_FEATURE_GLX13_MASK)
      _glc_glx_context_create_glx13 (screen_info,
                                     screen_info->format_ids[format->id],

Index: glc_glx_extension.c
===================================================================
RCS file: /cvs/cairo/libglc/src/glc_glx_extension.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** a/glc_glx_extension.c	20 Feb 2004 17:40:57 -0000	1.10
--- b/glc_glx_extension.c	23 Feb 2004 22:38:14 -0000	1.11
***************
*** 87,92 ****
        _glc_glx_proc_address.glx_get_visual_from_fbconfig &&
        _glc_glx_proc_address.glx_create_pbuffer &&
!       _glc_glx_proc_address.glx_destroy_pbuffer)
      screen_info->feature_mask |= GLC_FEATURE_OFFSCREEN_DRAWING_MASK;
  #endif
  
--- 87,94 ----
        _glc_glx_proc_address.glx_get_visual_from_fbconfig &&
        _glc_glx_proc_address.glx_create_pbuffer &&
!       _glc_glx_proc_address.glx_destroy_pbuffer) {
      screen_info->feature_mask |= GLC_FEATURE_OFFSCREEN_DRAWING_MASK;
+     screen_info->glx_feature_mask |= GLC_GLX_FEATURE_GLX13_MASK;
+   }
  #endif
  

Index: glc_glx_format.c
===================================================================
RCS file: /cvs/cairo/libglc/src/glc_glx_format.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** a/glc_glx_format.c	18 Feb 2004 14:52:45 -0000	1.15
--- b/glc_glx_format.c	23 Feb 2004 22:38:14 -0000	1.16
***************
*** 225,228 ****
--- 225,229 ----
    if (!fbconfigs) {
      screen_info->feature_mask &= ~GLC_FEATURE_OFFSCREEN_DRAWING_MASK;
+     screen_info->glx_feature_mask &= ~GLC_GLX_FEATURE_GLX13_MASK;
      return 1;
    }

Index: glcint.h
===================================================================
RCS file: /cvs/cairo/libglc/src/glcint.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** a/glcint.h	21 Feb 2004 03:19:12 -0000	1.19
--- b/glcint.h	23 Feb 2004 22:38:14 -0000	1.20
***************
*** 510,513 ****
--- 510,514 ----
  #define GLC_GLX_FEATURE_ARB_FRAGMENT_PROGRAM_MASK (1L << 5)
  #define GLC_GLX_FEATURE_ATI_RENDER_TEXTURE_MASK   (1L << 6)
+ #define GLC_GLX_FEATURE_GLX13_MASK                (1L << 7)
  
  typedef struct _glc_glx_surface glc_glx_surface_t;