← Back to branch summary

~ubuntu-branches/ubuntu/vivid/virtualbox-ose/vivid

« back to all changes in this revision

Viewing changes to src/VBox/GuestHost/OpenGL/state_tracker/state_glsl.c

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2010-03-11 17:16:37 UTC
  • mfrom: (0.3.4 upstream) (0.4.8 sid)
  • Revision ID: james.westby@ubuntu.com-20100311171637-43z64ia3ccpj8vqn
Tags: 3.1.4-dfsg-2ubuntu1
https://launchpad.net/bugs/528561
https://launchpad.net/bugs/288590
https://launchpad.net/bugs/535297
* Merge from Debian unstable (LP: #528561), remaining changes:
  - 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
  - Replace *-source packages with transitional packages for *-dkms
* Fix crash in vboxvideo_drm with kernel 2.6.33 / backported drm code
  (LP: #535297)
* Add a list of linux-headers packages to the apport hook
* Update debian/patches/u02-lp-integration.dpatch with a
  DEP-3 compliant header
* Add ${misc:Depends} to virtualbox-ose-source and virtualbox-ose-guest-source
  Depends

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/GuestHost/OpenGL/state_tracker/state_glsl.c
984
984
 
985
985
    if (pShader->source)
986
986
    {
987
 
        diff_api.ShaderSource(pShader->hwid, 1, &pShader->source, NULL);
 
987
        diff_api.ShaderSource(pShader->hwid, 1, (const char**)&pShader->source, NULL);
988
988
        if (pShader->compiled)
989
989
            diff_api.CompileShader(pShader->hwid);
990
990
        crFree(pShader->source);
1003
1003
    
1004
1004
    if (pShader->source)
1005
1005
    {
1006
 
        diff_api.ShaderSource(pShader->hwid, 1, &pShader->source, NULL);
 
1006
        diff_api.ShaderSource(pShader->hwid, 1, (const char**)&pShader->source, NULL);
1007
1007
        if (pShader->compiled)
1008
1008
            diff_api.CompileShader(pShader->hwid);
1009
1009
    }