← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/VBox/Frontends/VirtualBox/shaders/mainOverlayNoDiscard2.c

  • 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/Frontends/VirtualBox/shaders/mainOverlayNoDiscard2.c
 
1
#extension GL_ARB_texture_rectangle : enable
 
2
uniform sampler2DRect uDstTex;
 
3
uniform vec4 uDstClr;
 
4
void vboxCConv();
 
5
void main(void)
 
6
{
 
7
    vec4 dstClr = texture2DRect(uDstTex, vec2(gl_TexCoord[2]));
 
8
    vec3 difClr = dstClr.rgb - uDstClr.rgb;
 
9
    if(any(greaterThan(difClr, vec3(0.01, 0.01, 0.01)))
 
10
        || any(lessThan(difClr, vec3(-0.01, -0.01, -0.01))))
 
11
    {
 
12
        gl_FragColor = dstClr;
 
13
    }
 
14
    else
 
15
    {
 
16
        vboxCConv();
 
17
    }
 
18
}