[cairo-commit] glitz/src glitz_agl_extension.c, 1.11, 1.12 glitz_glx_extension.c, 1.14, 1.15

[David Reveman]

Committed by: davidr

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

Modified Files:
	glitz_agl_extension.c glitz_glx_extension.c 
Log Message:
Fixed extension checking

Index: glitz_agl_extension.c
===================================================================
RCS file: /cvs/cairo/glitz/src/glitz_agl_extension.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** glitz_agl_extension.c	13 Sep 2004 17:50:38 -0000	1.11
--- glitz_agl_extension.c	15 Sep 2004 20:26:44 -0000	1.12
***************
*** 41,59 ****
      GLITZ_AGL_FEATURE_TEXTURE_RECTANGLE_MASK },
    { 0.0, "GL_NV_texture_rectangle", GLITZ_AGL_FEATURE_TEXTURE_RECTANGLE_MASK },
!   { 2.0, "GL_ARB_texture_non_power_of_two",
      GLITZ_AGL_FEATURE_TEXTURE_NON_POWER_OF_TWO_MASK },
!   { 1.4, "GL_ARB_texture_mirrored_repeat",
      GLITZ_AGL_FEATURE_TEXTURE_MIRRORED_REPEAT_MASK },
!   { 1.3, "GL_ARB_texture_border_clamp",
      GLITZ_AGL_FEATURE_TEXTURE_BORDER_CLAMP_MASK },
!   { 1.3, "GL_ARB_texture_env_combine",
      GLITZ_AGL_FEATURE_TEXTURE_ENV_COMBINE_MASK },
    { 0.0, "GL_EXT_texture_env_combine",
      GLITZ_AGL_FEATURE_TEXTURE_ENV_COMBINE_MASK },
!   { 1.3, "GL_ARB_texture_env_dot3", GLITZ_AGL_FEATURE_TEXTURE_ENV_DOT3_MASK },
!   { 1.3, "GL_ARB_multisample", GLITZ_AGL_FEATURE_MULTISAMPLE_MASK },
    { 0.0, "GL_NV_multisample_filter_hint",
      GLITZ_AGL_FEATURE_MULTISAMPLE_FILTER_HINT_MASK },
!   { 1.3, "GL_ARB_multitexture", GLITZ_AGL_FEATURE_MULTITEXTURE_MASK },
    { 0.0, "GL_ARB_fragment_program", GLITZ_AGL_FEATURE_FRAGMENT_PROGRAM_MASK },
    
--- 41,59 ----
      GLITZ_AGL_FEATURE_TEXTURE_RECTANGLE_MASK },
    { 0.0, "GL_NV_texture_rectangle", GLITZ_AGL_FEATURE_TEXTURE_RECTANGLE_MASK },
!   { 0.0, "GL_ARB_texture_non_power_of_two",
      GLITZ_AGL_FEATURE_TEXTURE_NON_POWER_OF_TWO_MASK },
!   { 0.0, "GL_ARB_texture_mirrored_repeat",
      GLITZ_AGL_FEATURE_TEXTURE_MIRRORED_REPEAT_MASK },
!   { 0.0, "GL_ARB_texture_border_clamp",
      GLITZ_AGL_FEATURE_TEXTURE_BORDER_CLAMP_MASK },
!   { 0.0, "GL_ARB_texture_env_combine",
      GLITZ_AGL_FEATURE_TEXTURE_ENV_COMBINE_MASK },
    { 0.0, "GL_EXT_texture_env_combine",
      GLITZ_AGL_FEATURE_TEXTURE_ENV_COMBINE_MASK },
!   { 0.0, "GL_ARB_texture_env_dot3", GLITZ_AGL_FEATURE_TEXTURE_ENV_DOT3_MASK },
!   { 0.0, "GL_ARB_multisample", GLITZ_AGL_FEATURE_MULTISAMPLE_MASK },
    { 0.0, "GL_NV_multisample_filter_hint",
      GLITZ_AGL_FEATURE_MULTISAMPLE_FILTER_HINT_MASK },
!   { 0.0, "GL_ARB_multitexture", GLITZ_AGL_FEATURE_MULTITEXTURE_MASK },
    { 0.0, "GL_ARB_fragment_program", GLITZ_AGL_FEATURE_FRAGMENT_PROGRAM_MASK },
    

Index: glitz_glx_extension.c
===================================================================
RCS file: /cvs/cairo/glitz/src/glitz_glx_extension.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** glitz_glx_extension.c	13 Sep 2004 17:50:38 -0000	1.14
--- glitz_glx_extension.c	15 Sep 2004 20:26:44 -0000	1.15
***************
*** 41,61 ****
      GLITZ_GLX_FEATURE_TEXTURE_RECTANGLE_MASK },
    { 0.0, "GL_NV_texture_rectangle", GLITZ_GLX_FEATURE_TEXTURE_RECTANGLE_MASK },
!   { 2.0, "GL_ARB_texture_non_power_of_two",
      GLITZ_GLX_FEATURE_TEXTURE_NON_POWER_OF_TWO_MASK },
!   { 1.4, "GL_ARB_texture_mirrored_repeat",
      GLITZ_GLX_FEATURE_TEXTURE_MIRRORED_REPEAT_MASK },
!   { 1.3, "GL_ARB_texture_border_clamp",
      GLITZ_GLX_FEATURE_TEXTURE_BORDER_CLAMP_MASK },
!   { 1.3, "GL_ARB_texture_env_combine",
      GLITZ_GLX_FEATURE_TEXTURE_ENV_COMBINE_MASK },
    { 0.0, "GL_EXT_texture_env_combine",
      GLITZ_GLX_FEATURE_TEXTURE_ENV_COMBINE_MASK },
!   { 1.3, "GL_ARB_texture_env_dot3", GLITZ_GLX_FEATURE_TEXTURE_ENV_DOT3_MASK },
!   { 1.3, "GL_ARB_multisample", GLITZ_GLX_FEATURE_MULTISAMPLE_MASK },
    { 0.0, "GL_NV_multisample_filter_hint",
      GLITZ_GLX_FEATURE_MULTISAMPLE_FILTER_HINT_MASK },
!   { 1.3, "GL_ARB_multitexture", GLITZ_GLX_FEATURE_MULTITEXTURE_MASK },
    { 0.0, "GL_ARB_fragment_program", GLITZ_GLX_FEATURE_FRAGMENT_PROGRAM_MASK },
!   { 1.5, "GL_ARB_vertex_buffer_object",
      GLITZ_GLX_FEATURE_VERTEX_BUFFER_OBJECT_MASK },
    { 0.0, "GL_EXT_pixel_buffer_object",
--- 41,61 ----
      GLITZ_GLX_FEATURE_TEXTURE_RECTANGLE_MASK },
    { 0.0, "GL_NV_texture_rectangle", GLITZ_GLX_FEATURE_TEXTURE_RECTANGLE_MASK },
!   { 0.0, "GL_ARB_texture_non_power_of_two",
      GLITZ_GLX_FEATURE_TEXTURE_NON_POWER_OF_TWO_MASK },
!   { 0.0, "GL_ARB_texture_mirrored_repeat",
      GLITZ_GLX_FEATURE_TEXTURE_MIRRORED_REPEAT_MASK },
!   { 0.0, "GL_ARB_texture_border_clamp",
      GLITZ_GLX_FEATURE_TEXTURE_BORDER_CLAMP_MASK },
!   { 0.0, "GL_ARB_texture_env_combine",
      GLITZ_GLX_FEATURE_TEXTURE_ENV_COMBINE_MASK },
    { 0.0, "GL_EXT_texture_env_combine",
      GLITZ_GLX_FEATURE_TEXTURE_ENV_COMBINE_MASK },
!   { 0.0, "GL_ARB_texture_env_dot3", GLITZ_GLX_FEATURE_TEXTURE_ENV_DOT3_MASK },
!   { 0.0, "GL_ARB_multisample", GLITZ_GLX_FEATURE_MULTISAMPLE_MASK },
    { 0.0, "GL_NV_multisample_filter_hint",
      GLITZ_GLX_FEATURE_MULTISAMPLE_FILTER_HINT_MASK },
!   { 0.0, "GL_ARB_multitexture", GLITZ_GLX_FEATURE_MULTITEXTURE_MASK },
    { 0.0, "GL_ARB_fragment_program", GLITZ_GLX_FEATURE_FRAGMENT_PROGRAM_MASK },
!   { 0.0, "GL_ARB_vertex_buffer_object",
      GLITZ_GLX_FEATURE_VERTEX_BUFFER_OBJECT_MASK },
    { 0.0, "GL_EXT_pixel_buffer_object",