← Back to branch summary

~ubuntu-branches/ubuntu/raring/virtualbox-ose/raring

« back to all changes in this revision

Viewing changes to src/VBox/Additions/common/crOpenGL/pack/packspu_get.py

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2009-12-18 16:44:29 UTC
  • mfrom: (0.3.3 upstream) (0.4.6 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091218164429-jd34ccexpv5na11a
Tags: 3.1.2-dfsg-1ubuntu1
https://launchpad.net/bugs/498219
https://launchpad.net/bugs/288590
https://launchpad.net/bugs/474625
https://launchpad.net/bugs/495935
https://launchpad.net/bugs/473334
* Merge from Debian unstable (LP: #498219), remaining changes:
  - Disable update action
    - debian/patches/u01-disable-update-action.dpatch
  - VirtualBox should go in Accessories, not in System tools (LP: #288590)
    - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop
  - Add Apport hook
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Add Launchpad integration
    - debian/control
    - debian/lpi-bug.xpm
    - debian/patches/u02-lp-integration.dpatch
* Fixes the following bugs:
  - Kernel module fails to build with Linux >= 2.6.32 (LP: #474625)
  - X.Org drivers need to be rebuilt against X-Server 1.7 (LP: #495935)
  - The *-source packages try to build the kernel modules even though the
    kernel headers aren't available (LP: #473334)
* Replace *-source packages with transitional packages for *-dkms.
* Adapt u01-disable-update-action.dpatch and u02-lp-integration.dpatch for
  new upstream version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Additions/common/crOpenGL/pack/packspu_get.py
68
68
        print '\t\tcrError( "packspu_%s doesn\'t work when there\'s no actual network involved!\\nTry using the simplequery SPU in your chain!" );' % func_name
69
69
        print '\t}'
70
70
        if func_name in simple_funcs:
71
 
            print '\tif (pname == GL_UNPACK_ALIGNMENT ||'
72
 
            print '\t\tpname == GL_UNPACK_ROW_LENGTH ||'
73
 
            print '\t\tpname == GL_UNPACK_SKIP_PIXELS ||'
74
 
            print '\t\tpname == GL_UNPACK_LSB_FIRST ||'
75
 
            print '\t\tpname == GL_UNPACK_SWAP_BYTES ||'
76
 
            print '#ifdef CR_OPENGL_VERSION_1_2'
77
 
            print '\t\tpname == GL_UNPACK_IMAGE_HEIGHT ||'
78
 
            print '#endif'
79
 
            print '\t\tpname == GL_UNPACK_SKIP_ROWS ||'
80
 
            print '\t\tpname == GL_PACK_ALIGNMENT ||'
81
 
            print '\t\tpname == GL_PACK_ROW_LENGTH ||'
82
 
            print '\t\tpname == GL_PACK_SKIP_PIXELS ||'
83
 
            print '\t\tpname == GL_PACK_LSB_FIRST ||'
84
 
            print '\t\tpname == GL_PACK_SWAP_BYTES ||'
85
 
            print '#ifdef CR_OPENGL_VERSION_1_2'
86
 
            print '\t\tpname == GL_PACK_IMAGE_HEIGHT ||'
87
 
            print '#endif'
88
 
            print '\t\tpname == GL_PACK_SKIP_ROWS'
89
 
            print '\t\t|| pname == GL_DRAW_BUFFER'
90
 
            print '#ifdef CR_OPENGL_VERSION_1_3'
91
 
            print '\t\t|| pname == GL_ACTIVE_TEXTURE'
92
 
            print '#endif'
93
 
            print '#ifdef CR_ARB_multitexture'
94
 
            print '\t\t|| pname == GL_ACTIVE_TEXTURE_ARB'
95
 
            print '#endif'
96
 
            print ') {'
97
 
            print '\t\t\tcrState%s( pname, params );' % func_name
98
 
            print '\t\t\treturn;'
99
 
            print '\t}'
 
71
            print """
 
72
    if (pname == GL_UNPACK_ALIGNMENT
 
73
        || pname == GL_UNPACK_ROW_LENGTH
 
74
        || pname == GL_UNPACK_SKIP_PIXELS
 
75
        || pname == GL_UNPACK_LSB_FIRST
 
76
        || pname == GL_UNPACK_SWAP_BYTES
 
77
#ifdef CR_OPENGL_VERSION_1_2
 
78
        || pname == GL_UNPACK_IMAGE_HEIGHT
 
79
#endif
 
80
        || pname == GL_UNPACK_SKIP_ROWS
 
81
        || pname == GL_PACK_ALIGNMENT
 
82
        || pname == GL_PACK_ROW_LENGTH
 
83
        || pname == GL_PACK_SKIP_PIXELS
 
84
        || pname == GL_PACK_LSB_FIRST
 
85
        || pname == GL_PACK_SWAP_BYTES
 
86
#ifdef CR_OPENGL_VERSION_1_2
 
87
        || pname == GL_PACK_IMAGE_HEIGHT
 
88
#endif
 
89
        || pname == GL_PACK_SKIP_ROWS
 
90
        || pname == GL_DRAW_BUFFER
 
91
#ifdef CR_OPENGL_VERSION_1_3
 
92
        || pname == GL_ACTIVE_TEXTURE
 
93
#endif
 
94
#ifdef CR_ARB_multitexture
 
95
        || pname == GL_ACTIVE_TEXTURE_ARB
 
96
#endif
 
97
        )
 
98
        {
 
99
            crState%s( pname, params );
 
100
            return;
 
101
        }
 
102
            """ % func_name
100
103
        params.append( ("&writeback", "foo", 0) )
101
104
        print '\tif (pack_spu.swap)'
102
105
        print '\t{'