diff options
| author | Michal Krol <michal@vmware.com> | 2010-03-10 15:49:30 +0100 |
|---|---|---|
| committer | Michal Krol <michal@vmware.com> | 2010-03-10 15:49:30 +0100 |
| commit | 3ce4375912c8ea488460e593e07c5bb15b92dca9 (patch) | |
| tree | 1011fa439bd829fd46a44fd99478135848800e73 /src/glut/mini/bitmap.c | |
| parent | f59f28093ea827bd234d8e1a36bdd56a9fce5f09 (diff) | |
| parent | 9b348d0ed125a22be3f318ac60cef6f201edfdab (diff) | |
Merge branch 'master' into gallium-sampler-view
Conflicts:
src/gallium/auxiliary/Makefile
src/gallium/auxiliary/SConscript
src/gallium/auxiliary/tgsi/tgsi_exec.c
src/gallium/auxiliary/util/u_blitter.c
src/gallium/drivers/i915/i915_context.h
src/gallium/drivers/i965/brw_context.h
src/gallium/drivers/llvmpipe/lp_context.h
src/gallium/drivers/nv50/nv50_context.h
src/gallium/drivers/nv50/nv50_state_validate.c
src/gallium/drivers/nv50/nv50_tex.c
src/gallium/drivers/r300/r300_blit.c
src/gallium/drivers/r300/r300_context.h
src/gallium/drivers/r300/r300_emit.c
src/gallium/drivers/r300/r300_state.c
src/gallium/drivers/softpipe/sp_context.h
src/gallium/drivers/svga/svga_context.h
src/gallium/drivers/svga/svga_pipe_sampler.c
Diffstat (limited to 'src/glut/mini/bitmap.c')
| -rw-r--r-- | src/glut/mini/bitmap.c | 56 |
1 files changed, 0 insertions, 56 deletions
diff --git a/src/glut/mini/bitmap.c b/src/glut/mini/bitmap.c deleted file mode 100644 index 55a031af0a..0000000000 --- a/src/glut/mini/bitmap.c +++ /dev/null @@ -1,56 +0,0 @@ - -/* Copyright (c) Mark J. Kilgard, 1994. */ - -/* This program is freely distributable without licensing fees - and is provided without guarantee or warrantee expressed or - implied. This program is -not- in the public domain. */ - -#include "glutbitmap.h" - -void APIENTRY -glutBitmapCharacter(GLUTbitmapFont font, int c) -{ - const BitmapCharRec *ch; - BitmapFontPtr fontinfo; - GLfloat swapbytes, lsbfirst, rowlength; - GLfloat skiprows, skippixels, alignment; - -#if defined(_WIN32) - fontinfo = (BitmapFontPtr) __glutFont(font); -#else - fontinfo = (BitmapFontPtr) font; -#endif - - if (c < fontinfo->first || - c >= fontinfo->first + fontinfo->num_chars) - return; - ch = fontinfo->ch[c - fontinfo->first]; - if (ch) { - /* Save current modes. */ -/* glGetFloatv(GL_UNPACK_SWAP_BYTES, &swapbytes); */ -/* glGetFloatv(GL_UNPACK_LSB_FIRST, &lsbfirst); */ -/* glGetFloatv(GL_UNPACK_ROW_LENGTH, &rowlength); */ -/* glGetFloatv(GL_UNPACK_SKIP_ROWS, &skiprows); */ -/* glGetFloatv(GL_UNPACK_SKIP_PIXELS, &skippixels); */ - glGetFloatv(GL_UNPACK_ALIGNMENT, &alignment); - /* Little endian machines (DEC Alpha for example) could - benefit from setting GL_UNPACK_LSB_FIRST to GL_TRUE - instead of GL_FALSE, but this would require changing the - generated bitmaps too. */ -/* glPixelStorei(GL_UNPACK_SWAP_BYTES, GL_FALSE); */ -/* glPixelStorei(GL_UNPACK_LSB_FIRST, GL_FALSE); */ -/* glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); */ -/* glPixelStorei(GL_UNPACK_SKIP_ROWS, 0); */ -/* glPixelStorei(GL_UNPACK_SKIP_PIXELS, 0); */ - glPixelStorei(GL_UNPACK_ALIGNMENT, 1); - glBitmap(ch->width, ch->height, ch->xorig, ch->yorig, - ch->advance, 0, ch->bitmap); - /* Restore saved modes. */ -/* glPixelStorei(GL_UNPACK_SWAP_BYTES, swapbytes); */ -/* glPixelStorei(GL_UNPACK_LSB_FIRST, (int)lsbfirst); */ -/* glPixelStorei(GL_UNPACK_ROW_LENGTH, (int)rowlength); */ -/* glPixelStorei(GL_UNPACK_SKIP_ROWS, skiprows); */ -/* glPixelStorei(GL_UNPACK_SKIP_PIXELS, skippixels); */ - glPixelStorei(GL_UNPACK_ALIGNMENT, (int)alignment); - } -} |