← Back to branch summary

~ubuntu-branches/ubuntu/trusty/virtualbox/trusty-proposed

« back to all changes in this revision

Viewing changes to src/VBox/HostServices/SharedOpenGL/crserverlib/server_simpleget.py

  • Committer: Package Import Robot
  • Author(s): Felix Geyer
  • Date: 2013-03-07 16:38:36 UTC
  • mfrom: (1.1.13) (3.1.20 experimental)
  • Revision ID: package-import@ubuntu.com-20130307163836-p93jpbgx39tp3gb4
Tags: 4.2.8-dfsg-0ubuntu1
http://bugs.debian.org/691148
http://bugs.debian.org/700823
https://launchpad.net/bugs/1101867
http://bugs.debian.org/700479
http://bugs.debian.org/686994
http://bugs.debian.org/680053
* New upstream release. (Closes: #691148)
  - Fixes compatibility with kernel 3.8. (Closes: #700823; LP: #1101867)
* Switch to my @debian.org email address.
* Move package to contrib as virtualbox 4.2 needs a non-free compiler to
  build the BIOS.
* Build-depend on libdevmapper-dev.
* Refresh patches.
  - Drop 36-fix-ftbfs-xserver-112.patch, cve-2012-3221.patch,
    CVE-2013-0420.patch 37-kcompat-3.6.patch and 38-kcompat-3.7.patch.
* Drop all virtualbox-ose transitional packages.
* Drop the virtualbox-fuse package as vdfuse fails to build with
  virtualbox 4.2.
* Update install files and VBox.sh.
* Bump required kbuild version to 0.1.9998svn2577.
* Fix path to VBoxCreateUSBNode.sh in virtualbox.postinst. (Closes: #700479)
* Add an init script to virtuabox-guest-x11 which loads the vboxvideo
  kernel module. The X Server 1.13 doesn't load it anymore. (Closes: #686994)
* Update man pages. (Closes: #680053)
* Add 36-python-multiarch.patch from Rico Tzschichholz to fix detection of
  python in multiarch paths using pkg-config.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/HostServices/SharedOpenGL/crserverlib/server_simpleget.py
75
75
        GLuint fboid;
76
76
        CRASSERT(tablesize/sizeof(%s)==1);
77
77
        fboid = crStateFBOHWIDtoID((GLuint) *get_values);
78
 
        if (crServerIsRedirectedToFBO()
 
78
        if (cr_server.curClient->currentMural->bUseFBO
 
79
            && crServerIsRedirectedToFBO()
79
80
            && fboid==cr_server.curClient->currentMural->idFBO)
80
81
        {
81
82
            fboid = 0;
82
83
        }
83
84
        *get_values = (%s) fboid;
84
85
    }
 
86
    else if (GL_READ_BUFFER==pname)
 
87
    {
 
88
        if (cr_server.curClient->currentMural->bUseFBO && crServerIsRedirectedToFBO()
 
89
            && cr_server.curClient->currentMural->idFBO
 
90
            && !crStateGetCurrent()->framebufferobject.readFB)
 
91
        {
 
92
            *get_values = (%s) crStateGetCurrent()->buffer.readBuffer;
 
93
        }
 
94
    }
 
95
    else if (GL_DRAW_BUFFER==pname)
 
96
    {
 
97
        if (cr_server.curClient->currentMural->bUseFBO && crServerIsRedirectedToFBO()
 
98
            && cr_server.curClient->currentMural->idFBO
 
99
            && !crStateGetCurrent()->framebufferobject.drawFB)
 
100
        {
 
101
            *get_values = (%s) crStateGetCurrent()->buffer.drawBuffer;
 
102
        }
 
103
    }
85
104
    else if (GL_RENDERBUFFER_BINDING_EXT==pname)
86
105
    {
87
106
        GLuint rbid;
113
132
                *get_values = (%s)CR_MAX_TEXTURE_UNITS;
114
133
        } 
115
134
    }
116
 
    """ % (types[index], types[index], types[index], types[index], types[index], types[index], types[index], types[index], types[index], types[index], types[index])
 
135
    """ % (types[index], types[index], types[index], types[index], types[index], types[index], types[index], types[index], types[index], types[index], types[index], types[index], types[index])
117
136
    print '\tcrServerReturnValue( get_values, tablesize );'
118
137
    print '\tcrFree(get_values);'
119
138
    print '}\n'