← Back to branch summary

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

« back to all changes in this revision

Viewing changes to NuxGraphics/IOpenGLAnimatedTexture.cpp

  • 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/IOpenGLAnimatedTexture.cpp
19
19
 *
20
20
 */
21
21
 
22
 
 
 
22
#include "GLResource.h"
 
23
#include "GraphicsDisplay.h"
23
24
#include "GpuDevice.h"
24
25
#include "GLDeviceObjects.h"
25
26
#include "IOpenGLAnimatedTexture.h"
40
41
  {
41
42
    for (int i = 0; i < Depth; i++)
42
43
    {
43
 
      ObjectPtr<IOpenGLBaseTexture> Texture = GetGpuDevice()->CreateSystemCapableDeviceTexture (Width, Height, 1, PixelFormat);
 
44
      ObjectPtr<IOpenGLBaseTexture> Texture = GetGraphicsDisplay()->GetGpuDevice()->CreateSystemCapableDeviceTexture (Width, Height, 1, PixelFormat);
44
45
      _FrameTextureArray.push_back (Texture);
45
46
      _FrameTimeArray.push_back (41); // 41 ms = 24 frames/second
46
47
    }