← Back to branch summary

~chasedouglas/ubuntu/maverick/xorg-server/multitouch

« back to all changes in this revision

Viewing changes to glx/glxdri2.c

  • Committer: Bazaar Package Importer
  • Author(s): Julien Cristau, Julien Cristau, Christopher James Halse Rogers
  • Date: 2010-06-07 23:22:48 UTC
  • mfrom: (0.9.4 upstream)
  • mto: This revision was merged to the branch mainline in revision 187.
  • Revision ID: james.westby@ubuntu.com-20100607232248-x9ob0sjy8bwkc2ki
Tags: 2:1.8.1.901-1
[ Julien Cristau ]
* New upstream release
* Merge changes from 2:1.7.7-2.

[ Christopher James Halse Rogers ]
* 16-xaa-fbcomposite-fix-negative-size.diff:
  - mi hunk merged upstream.  Update to keep just the fbpict.c hunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
glx/glxdri2.c
616
616
static void
617
617
initializeExtensions(__GLXDRIscreen *screen)
618
618
{
 
619
    ScreenPtr pScreen = screen->base.pScreen;
619
620
    const __DRIextension **extensions;
620
621
    int i;
621
622
 
625
626
                         "GLX_MESA_copy_sub_buffer");
626
627
    LogMessage(X_INFO, "AIGLX: enabled GLX_MESA_copy_sub_buffer\n");
627
628
 
628
 
    /* FIXME: only if DDX supports it */
629
629
    __glXEnableExtension(screen->glx_enable_bits, "GLX_INTEL_swap_event");
630
630
    LogMessage(X_INFO, "AIGLX: enabled GLX_INTEL_swap_event\n");
631
631
 
 
632
    if (DRI2HasSwapControl(pScreen)) {
 
633
        __glXEnableExtension(screen->glx_enable_bits,
 
634
                             "GLX_SGI_swap_control");
 
635
        __glXEnableExtension(screen->glx_enable_bits,
 
636
                             "GLX_MESA_swap_control");
 
637
        LogMessage(X_INFO, "AIGLX: enabled GLX_SGI_swap_control and GLX_MESA_swap_control\n");
 
638
    }
 
639
 
632
640
    for (i = 0; extensions[i]; i++) {
633
641
#ifdef __DRI_READ_DRAWABLE
634
642
        if (strcmp(extensions[i]->name, __DRI_READ_DRAWABLE) == 0) {
639
647
        }
640
648
#endif
641
649
 
642
 
#ifdef __DRI_SWAP_CONTROL
643
 
        if (strcmp(extensions[i]->name, __DRI_SWAP_CONTROL) == 0) {
644
 
            screen->swapControl =
645
 
                (const __DRIswapControlExtension *) extensions[i];
646
 
            __glXEnableExtension(screen->glx_enable_bits,
647
 
                                 "GLX_SGI_swap_control");
648
 
            __glXEnableExtension(screen->glx_enable_bits,
649
 
                                 "GLX_MESA_swap_control");
650
 
            
651
 
            LogMessage(X_INFO, "AIGLX: enabled GLX_SGI_swap_control and GLX_MESA_swap_control\n");
652
 
        }
653
 
#endif
654
 
 
655
650
#ifdef __DRI_TEX_BUFFER
656
651
        if (strcmp(extensions[i]->name, __DRI_TEX_BUFFER) == 0) {
657
652
            screen->texBuffer =