← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/nux/oneiric

« back to all changes in this revision

Viewing changes to NuxGraphics/NuxGraphics.h

  • Committer: Bazaar Package Importer
  • Author(s): Didier Roche
  • Date: 2011-06-22 17:16:16 UTC
  • mfrom: (1.1.21 upstream)
  • Revision ID: james.westby@ubuntu.com-20110622171616-3cyhhiwsb6ga9d30
Tags: 1.0.2-0ubuntu1
* New upstream release.
* Cherry-pick a fix for FTBFS with -fpermissive
* debian/control:
  - add new libxdamage-dev and libxcomposite-dev build-dep
  - add new libboost1.42-dev dep as well, should be transitionned to 1.46 once
    compiz is transitionned as well
* remove debian/patches/01_build_with_gcc46.patch as included upstream
* debian/rules:
  - disable google code tests while building
* debian/control, debian/rules, debian/libnux-1.0-common.install,
  debian/libnux-1.0-dev.install, debian/libnux-1.0-doc.install,
  debian/libnux-1.0-0.install:
  - change, prepare next ABI breakage and remove no more needed Breaks: with
    new soname bump
* libnux-1.0-common now replaces: libnux-0.9-common for the apport hook

Show diffs side-by-side

added added

removed removed

Lines of Context:
NuxGraphics/NuxGraphics.h
28
28
  class GpuDevice;
29
29
  class GraphicsEngine;
30
30
 
31
 
  GraphicsDisplay *GetThreadGLWindow (); // Deprecated use GetDisplayDevice
32
 
  GraphicsDisplay *GetDisplayDevice ();
33
 
  GpuDevice *GetThreadGLDeviceFactory (); // Deprecated use GetGpuDevice
34
 
  GpuDevice *GetGpuDevice ();
35
 
  GraphicsEngine *GetThreadGraphicsContext();
 
31
  GraphicsDisplay* GetGraphicsDisplay();
36
32
 
37
33
  #define NUX_FINDRESOURCELOCATION(a) GNuxGraphicsResources.FindResourceLocation(a, false)()
38
34
  #define NUX_FIND_RESOURCE_LOCATION_NOFAIL(a) GNuxGraphicsResources.FindResourceLocation(a, true)()
39
35
 
40
36
  inlDeclareThreadLocalStorage (GraphicsDisplay *, 1, _TLS_GraphicsDisplay);
41
 
  inlDeclareThreadLocalStorage (GpuDevice *, 2, _TLS_GpuDevice_);
42
37
 
43
38
  void NuxGraphicsInitialize();
44
39
}