← Back to branch summary

~unity-team/nux/nux-remove-glew-mx

« back to all changes in this revision

Viewing changes to gputests/texture_power_of_2.cpp

  • Committer: Jay Taoko
  • Date: 2011-05-30 02:54:31 UTC
  • mfrom: (353.1.1 nux)
  • Revision ID: jay.taoko@canonical.com-20110530025431-kpqcnbcq3apsfz92
* Object::Dispose() now does the same thing as Object::UnReference()
* Fixed memory leak in UXTheme::Load2DTextureFile
* Mesh Resource manager
    - Fixed mesh Resource manager pipeline
    - See example ProgObjMeshLoader

* Fixed GLSL Shaders in FontRendering.cpp
    - removed global variable USE_ARB_SHADERS and replaced with GraphicsEngine::UsingGLSLCodePath()

* Removing files IniFile.cpp/.h
* Removing files UIColorTheme.cpp/.h

Show diffs side-by-side

added added

removed removed

Lines of Context:
gputests/texture_power_of_2.cpp
58
58
 
59
59
  for (int i = 0; i < 9; i++)
60
60
  {
61
 
    nux::NBitmapData *bitmap = nux::LoadImageFile (texture_list[i]);
62
 
    nux::ImageSurface surface = bitmap->GetSurface (0);
63
 
 
64
 
    surface.GetFormat ();
65
 
 
66
 
    tex[i] = nux::GetThreadGLDeviceFactory()->CreateTexture (
 
61
    nux::NBitmapData *bitmap = nux::LoadImageFile(texture_list[i]);
 
62
    nux::ImageSurface surface = bitmap->GetSurface(0);
 
63
 
 
64
    surface.GetFormat();
 
65
 
 
66
    tex[i] = nux::GetGraphicsDisplay()->GetGpuDevice()->CreateTexture(
67
67
      surface.GetWidth(),
68
 
      surface.GetHeight (),
 
68
      surface.GetHeight(),
69
69
      1,
70
 
      surface.GetFormat ());
 
70
      surface.GetFormat());
71
71
 
72
72
    nux::SURFACE_LOCKED_RECT lockrect;
73
73
    tex[i]->LockRect(0, &lockrect, 0);