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

« back to all changes in this revision

Viewing changes to src/VBox/GuestHost/OpenGL/state_tracker/state_init.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
* 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:
123
123
    crStateTextureInit( ctx );
124
124
    crStateTransformInit( ctx );
125
125
    crStateViewportInit ( ctx );
126
 
    
 
126
    crStateFramebufferObjectInit(ctx);
 
127
    crStateGLSLInit(ctx);
 
128
 
127
129
    /* This has to come last. */
128
130
    crStateAttribInit( &(ctx->attrib) );
129
131
 
189
191
    crStateTextureDestroy( ctx );
190
192
    crStateTransformDestroy( ctx );
191
193
    crStateFreeShared(ctx->shared);
 
194
    crStateFramebufferObjectDestroy(ctx);
 
195
    crStateGLSLDestroy(ctx);
192
196
    crFree( ctx );
193
197
}
194
198