[cairo-commit] glitz/src glitz_glx_context.c, 1.6, 1.7 glitz_glx_info.c, 1.6, 1.7 glitz_glxint.h, 1.8, 1.9

[David Reveman]

Committed by: davidr

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

Modified Files:
	glitz_glx_context.c glitz_glx_info.c glitz_glxint.h 
Log Message:
Only check the number of texture indirections if fragment program extension is supported

Index: glitz_glx_context.c
===================================================================
RCS file: /cvs/cairo/glitz/src/glitz_glx_context.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** a/glitz_glx_context.c	18 May 2004 15:01:50 -0000	1.6
--- b/glitz_glx_context.c	28 May 2004 01:04:29 -0000	1.7
***************
*** 198,204 ****
  
  void
! glitz_glx_context_proc_address_lookup (glitz_glx_thread_info_t *thread_info,
                                         glitz_glx_context_t *context)
  {
    context->glx.bind_tex_image_arb =
      (glitz_glx_bind_tex_image_arb_t)
--- 198,207 ----
  
  void
! glitz_glx_context_proc_address_lookup (glitz_glx_screen_info_t *screen_info,
                                         glitz_glx_context_t *context)
  {
+   glitz_glx_thread_info_t *thread_info =
+     screen_info->display_info->thread_info;
+     
    context->glx.bind_tex_image_arb =
      (glitz_glx_bind_tex_image_arb_t)
***************
*** 234,241 ****
      glitz_glx_get_proc_address (thread_info, "glGetProgramivARB");
  
!   if (context->gl.get_program_iv_arb) {
!     context->gl.get_program_iv_arb (GLITZ_GL_FRAGMENT_PROGRAM_ARB,
!                                     GLITZ_GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB,
!                                     &context->texture_indirections);
    }
    
--- 237,247 ----
      glitz_glx_get_proc_address (thread_info, "glGetProgramivARB");
  
!   if (screen_info->feature_mask & GLITZ_FEATURE_ARB_FRAGMENT_PROGRAM_MASK) {
!     if (context->gl.get_program_iv_arb) {
!       context->gl.get_program_iv_arb
!         (GLITZ_GL_FRAGMENT_PROGRAM_ARB,
!          GLITZ_GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB,
!          &context->texture_indirections);
!     }
    }
    
***************
*** 280,285 ****
  
    if (surface->context->gl.need_lookup)
!     glitz_glx_context_proc_address_lookup
!       (surface->screen_info->display_info->thread_info, surface->context);
  }
  
--- 286,291 ----
  
    if (surface->context->gl.need_lookup)
!     glitz_glx_context_proc_address_lookup (surface->screen_info,
!                                            surface->context);
  }
  

Index: glitz_glx_info.c
===================================================================
RCS file: /cvs/cairo/glitz/src/glitz_glx_info.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** a/glitz_glx_info.c	18 May 2004 15:01:50 -0000	1.6
--- b/glitz_glx_info.c	28 May 2004 01:04:29 -0000	1.7
***************
*** 415,420 ****
      glPixelStorei (GL_UNPACK_ALIGNMENT, 4);
  
!     glitz_glx_context_proc_address_lookup
!       (screen_info->display_info->thread_info, &screen_info->root_context);
      
      glitz_glx_query_extensions (screen_info);
--- 415,420 ----
      glPixelStorei (GL_UNPACK_ALIGNMENT, 4);
  
!     glitz_glx_context_proc_address_lookup (screen_info,
!                                            &screen_info->root_context);
      
      glitz_glx_query_extensions (screen_info);

Index: glitz_glxint.h
===================================================================
RCS file: /cvs/cairo/glitz/src/glitz_glxint.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** a/glitz_glxint.h	18 May 2004 15:01:50 -0000	1.8
--- b/glitz_glxint.h	28 May 2004 01:04:29 -0000	1.9
***************
*** 171,175 ****
  
  extern void __internal_linkage
! glitz_glx_context_proc_address_lookup (glitz_glx_thread_info_t *thread_info,
                                         glitz_glx_context_t *context);
  
--- 171,175 ----
  
  extern void __internal_linkage
! glitz_glx_context_proc_address_lookup (glitz_glx_screen_info_t *screen_info,
                                         glitz_glx_context_t *context);