← Back to branch summary

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

« back to all changes in this revision

Viewing changes to Nux/WindowThread.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:
Nux/WindowThread.cpp
76
76
    MSG msg;
77
77
    retval = PeekMessageW (&msg, NULL, 0, 0, PM_NOREMOVE) ? TRUE : FALSE;
78
78
#elif defined(NUX_OS_LINUX)
79
 
    retval = GetThreadGLWindow()->HasXPendingEvent () ? TRUE : FALSE;
 
79
    retval = GetGraphicsDisplay()->HasXPendingEvent () ? TRUE : FALSE;
80
80
#else
81
81
#error Not implemented.
82
82
#endif
99
99
      MSG msg;
100
100
      retval = PeekMessageW (&msg, NULL, 0, 0, PM_NOREMOVE) ? TRUE : FALSE;
101
101
#elif defined(NUX_OS_LINUX)
102
 
      retval = GetThreadGLWindow()->HasXPendingEvent () ? TRUE : FALSE;
 
102
      retval = GetGraphicsDisplay()->HasXPendingEvent () ? TRUE : FALSE;
103
103
#else
104
104
#error Not implemented.
105
105
#endif
235
235
#if defined(NUX_OS_WINDOWS)
236
236
    event_source->event_poll_fd.fd = G_WIN32_MSG_HANDLE;
237
237
#elif defined(NUX_OS_LINUX)
238
 
    event_source->event_poll_fd.fd = ConnectionNumber (GetThreadGLWindow()->GetX11Display() );
 
238
    event_source->event_poll_fd.fd = ConnectionNumber (GetGraphicsDisplay()->GetX11Display() );
239
239
#else
240
240
#error Not implemented.
241
241
#endif
1863
1863
 
1864
1864
    CHECKGL ( glColorMask (GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE) );
1865
1865
 
1866
 
    GetGpuDevice()->DeactivateFrameBuffer();
 
1866
    GetGraphicsDisplay()->GetGpuDevice()->DeactivateFrameBuffer();
1867
1867
  }
1868
1868
 
1869
1869
  int WindowThread::InstallEventInspector (EventInspector function, void* data)