← Back to branch summary

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

« back to all changes in this revision

Viewing changes to NuxGraphics/GLSh_ColorPicker.cpp

  • Committer: Tim Penhey
  • Date: 2011-06-20 23:21:56 UTC
  • mfrom: (344.9.2 std-0x)
  • Revision ID: tim.penhey@canonical.com-20110620232156-mak2ufu5b504ce86
Updates to the NuxGraphics code so nux can compile with -std=c++0x.

Show diffs side-by-side

added added

removed removed

Lines of Context:
NuxGraphics/GLSh_ColorPicker.cpp
355
355
 
356
356
  void GLSh_ColorPicker::Render (int x, int y, int z, int width, int height, int WindowWidth, int WindowHeight)
357
357
  {
 
358
    float fx = x, fy = y;
358
359
    float VtxBuffer[] =
359
360
    {
360
 
      x,          y,          0.0f, 1.0f,
361
 
      x,          y + height, 0.0f, 1.0f,
362
 
      x + width,  y + height, 0.0f, 1.0f,
363
 
      x + width,  y,          0.0f, 1.0f,
 
361
      fx,          fy,          0.0f, 1.0f,
 
362
      fx,          fy + height, 0.0f, 1.0f,
 
363
      fx + width,  fy + height, 0.0f, 1.0f,
 
364
      fx + width,  fy,          0.0f, 1.0f,
364
365
    };
365
366
 
366
367
    if (GetGraphicsDisplay()->GetGraphicsEngine()->UsingGLSLCodePath() && (GetGraphicsDisplay()->GetGpuDevice()->GetGPUBrand() != GPU_BRAND_INTEL) )