← Back to branch summary

~azzar1/unity/fix-1036231-5.0

« back to all changes in this revision

Viewing changes to plugins/unityshell/src/StaticCairoText.cpp

  • Committer: Jay Taoko
  • Date: 2011-11-08 19:41:00 UTC
  • mfrom: (1722.1.1 nux20port)
  • Revision ID: jay.taoko@canonical.com-20111108194100-56eqlm272lkwmr6a
* Removed custom nux type such as t_u32 and replaced with unsigned int. Custom type definitions have be removed from Nux trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/unityshell/src/StaticCairoText.cpp
175
175
  texxform.SetWrap(TEXWRAP_REPEAT, TEXWRAP_REPEAT);
176
176
  texxform.SetTexCoordType(TexCoordXForm::OFFSET_COORD);
177
177
 
178
 
  t_u32 alpha = 0, src = 0, dest = 0;
 
178
  unsigned int alpha = 0, src = 0, dest = 0;
179
179
 
180
180
  gfxContext.GetRenderStates().GetBlend(alpha, src, dest);
181
181
  gfxContext.GetRenderStates().SetBlend(true, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);