← Back to branch summary

~ubuntu-branches/ubuntu/raring/xscreensaver/raring

« back to all changes in this revision

Viewing changes to hacks/glx/carousel.c

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell
  • Date: 2010-11-17 15:40:52 UTC
  • mfrom: (1.1.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20101117154052-w4ou7vty38gpp1r3
Tags: 5.12-0ubuntu1
New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
hacks/glx/carousel.c
496
496
  carousel_state *ss = &sss[MI_SCREEN(mi)];
497
497
  int wire = MI_IS_WIREFRAME(mi);
498
498
  char text[100];
499
 
  GLfloat scale;
500
499
 
501
500
  if (wire) return;
502
501
 
509
508
  if (ss->loading_sw == 0)    /* only do this once, so that the string doesn't move. */
510
509
    ss->loading_sw = texture_string_width (ss->texfont, text, &ss->loading_sh);
511
510
 
512
 
  scale = ss->loading_sh / (GLfloat) MI_HEIGHT(mi);
513
 
 
514
511
  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
515
512
 
516
513
  glMatrixMode(GL_PROJECTION);