← Back to branch summary

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

« back to all changes in this revision

Viewing changes to gputests/texture_copy_blur.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:
gputests/texture_copy_blur.cpp
104
104
        nux::RandomUInt(200),
105
105
        nux::RandomUInt(200));
106
106
 
107
 
      graphics_engine->QRP_Color(geo.x, geo.y, geo.width, geo.height, nux::Color::RandomColor());
 
107
      graphics_engine->QRP_Color(geo.x, geo.y, geo.width, geo.height, nux::color::RandomColor());
108
108
    }
109
109
 
110
110
    nux::TexCoordXForm texxform;
117
117
    // Make a blurred version of the back buffer
118
118
    nux::ObjectPtr <nux::IOpenGLBaseTexture> tex_blur = graphics_engine->QRP_GetBlurTexture (
119
119
      0, 0, tex_copy->GetWidth (), tex_copy->GetHeight (),
120
 
      tex_copy, texxform, nux::Colors::White, 1.0f);
 
120
      tex_copy, texxform, nux::color::White, 1.0f);
121
121
 
122
122
    // Render the blurred texture
123
 
    graphics_engine->QRP_1Tex(0, 0, tex_blur->GetWidth(), tex_blur->GetHeight(), tex_blur, texxform, nux::Colors::White);
 
123
    graphics_engine->QRP_1Tex(0, 0, tex_blur->GetWidth(), tex_blur->GetHeight(), tex_blur, texxform, nux::color::White);
124
124
 
125
125
    sprintf(fps, "FPS: %3.2f", frame_rate);
126
126
    nux::PageBBox page;
130
130
    page.ymax = 20;
131
131
    page.x_margin = 0;
132
132
    page.y_margin = 0;
133
 
    graphics_engine->RenderColorTextLineStatic(graphics_engine->GetBoldFont (), page, fps, nux::Colors::White, false, nux::eAlignTextLeft);    
 
133
    graphics_engine->RenderColorTextLineStatic(graphics_engine->GetBoldFont (), page, fps, nux::color::White, false, nux::eAlignTextLeft);
134
134
 
135
135
    graphics_display->SwapBuffer();
136
136