← Back to branch summary

~ubuntu-branches/ubuntu/precise/xorg-server/precise

« back to all changes in this revision

Viewing changes to hw/xwin/glx/indirect.c

  • Committer: Package Import Robot
  • Author(s): Timo Aaltonen, Christopher James Halse Rogers, Ricardo Salveti de Araujo, Timo Aaltonen, Bryce Harrington, Chase Douglas
  • Date: 2011-09-09 14:13:07 UTC
  • mfrom: (1.1.45 upstream) (0.11.27 sid)
  • Revision ID: package-import@ubuntu.com-20110909141307-7x9s9j3l5kkren6o
Tags: 2:1.10.4-1ubuntu1
https://launchpad.net/bugs/817814
https://launchpad.net/bugs/828494
https://launchpad.net/bugs/821090
[ Christopher James Halse Rogers ]
* Drop i8xx-disablement patch.  2.6.39 and later kernels contain a patch
  which alledgedly fixes the cache-incoherency problems. (LP: #817814)

[ Ricardo Salveti de Araujo ]
* debian/patches/112_armel-pvr-drv.patch:
  - Include support for the pvr driver available on OMAP 4 (LP: #828494)

[ Timo Aaltonen ]
* Merge from Debian unstable.
  - Fixes Xephyr assert failure in dixGetPrivateAddr (LP: #821090)
* debian/rules: Modify the patch stampdir creation.
* Update patch 500_xi2.1.patch to apply.
* Refresh patches.
* debian/rules: Add PATH for the xvfb-run check, otherwise Xvfb is not found.
* debian/rules: Shift the xvfb-run test to be run later, to ensure that the
  binaries are installed.

[ Bryce Harrington ]
* debian/rules: Add check target invoking xvfb-run to test that it works
* debian/control: Add build dependency on xauth, required by xvfb-run

[ Chase Douglas ]
* Add fixes for touch grab handling, courtesy of Carlos Garnacho
  - 505_Xi_ensure_replayed_touch_events_have_devices.patch
  - 506_Xi_ensure_touch_events_update_currentTime.patch
  - 507_dix_Ensure_touch_events_are_delivered_to_next_client.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
hw/xwin/glx/indirect.c
689
689
 
690
690
      //
691
691
      // Override the GLX version (__glXScreenInit() sets it to "1.2")
692
 
      // if we have all the needed extensionsto operate as a higher version
 
692
      // if we have all the needed extensions to operate as a higher version
693
693
      //
694
694
      // SGIX_fbconfig && SGIX_pbuffer && SGI_make_current_read -> 1.3
695
695
      // ARB_multisample -> 1.4
696
696
      //
697
697
      if (screen->has_WGL_ARB_pbuffer && glx_sgi_make_current_read)
698
698
        {
699
 
          free(screen->base.GLXversion);
700
 
 
701
699
          if (screen->has_WGL_ARB_multisample)
702
700
            {
703
 
              screen->base.GLXversion = strdup("1.4");
704
701
              screen->base.GLXmajor = 1;
705
702
              screen->base.GLXminor = 4;
706
703
            }
707
704
          else
708
705
            {
709
 
              screen->base.GLXversion = strdup("1.3");
710
706
              screen->base.GLXmajor = 1;
711
707
              screen->base.GLXminor = 3;
712
708
            }
713
 
          LogMessage(X_INFO, "AIGLX: Set GLX version to %s\n", screen->base.GLXversion);
714
709
        }
715
710
    }
 
711
    LogMessage(X_INFO, "AIGLX: Set GLX version to %d.%d\n", screen->base.GLXmajor, screen->base.GLXminor);
716
712
 
717
713
    wglMakeCurrent(NULL, NULL);
718
714
    wglDeleteContext(hglrc);