← 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_getshaders.c

  • 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_getshaders.c
5
5
 */
6
6
 
7
7
/*
8
 
 * Copyright (C) 2009 Oracle Corporation
 
8
 * Copyright (C) 2009-2012 Oracle Corporation
9
9
 *
10
10
 * This file is part of VirtualBox Open Source Edition (OSE), as
11
11
 * available from http://www.virtualbox.org. This file is free software;
254
254
 
255
255
GLuint SERVER_DISPATCH_APIENTRY crServerDispatchCreateShader(GLenum type)
256
256
{
257
 
    GLuint retval;
258
 
    retval = cr_server.head_spu->dispatch_table.CreateShader(type);
259
 
    crStateCreateShader(retval, type);
 
257
    GLuint retval, hwVal;
 
258
    hwVal = cr_server.head_spu->dispatch_table.CreateShader(type);
 
259
    retval = crStateCreateShader(hwVal, type);
260
260
    crServerReturnValue(&retval, sizeof(retval));
261
261
    return retval; /* ignored */
262
262
}
263
263
 
264
264
GLuint SERVER_DISPATCH_APIENTRY crServerDispatchCreateProgram(void)
265
265
{
266
 
    GLuint retval;
267
 
    retval = cr_server.head_spu->dispatch_table.CreateProgram();
268
 
    crStateCreateProgram(retval);
 
266
    GLuint retval, hwVal;
 
267
    hwVal = cr_server.head_spu->dispatch_table.CreateProgram();
 
268
    retval = crStateCreateProgram(hwVal);
269
269
    crServerReturnValue(&retval, sizeof(retval));
270
270
    return retval; /* ignored */
271
271
}