diff options
| author | Brian Paul <[email protected]> | 2004-04-22 00:27:31 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2004-04-22 00:27:31 +0000 |
| commit | f959f6e1dc27c71fc0ccc56e09b29101b3bf3b97 (patch) | |
| tree | 15b4171c2b3396e3a05f2776cc24d90cb37c8f84 /src/mesa/main/imports.c | |
| parent | 05a6f2fd484bab59c6e6a381f58808adc26619f1 (diff) | |
New glTexImage code.
The gl_texture_format struct now has a StoreTexImageFunc that's called
by glTex[Sub]Image[123]D to convert the user's texture data into the
specific texture format layout. Now it's much easier to add new texture
formats (like the 16/32-bit floating point formats).
The texutil.[ch] and texutil_tmp.h files are obsolete.
Diffstat (limited to 'src/mesa/main/imports.c')
| -rw-r--r-- | src/mesa/main/imports.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c index f8fa835394a..0afc4ea4313 100644 --- a/src/mesa/main/imports.c +++ b/src/mesa/main/imports.c @@ -32,9 +32,9 @@ /* * Mesa 3-D graphics library - * Version: 5.1 + * Version: 6.1 * - * Copyright (C) 1999-2003 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2004 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -533,7 +533,7 @@ _mesa_bitcount(unsigned int n) * Based on code from: * http://www.opengl.org/discussion_boards/ubb/Forum3/HTML/008786.html */ -GLhalfNV +GLhalfARB _mesa_float_to_half(float val) { const int flt = *((int *) &val); @@ -541,7 +541,7 @@ _mesa_float_to_half(float val) const int flt_e = (flt >> 23) & 0xff; const int flt_s = (flt >> 31) & 0x1; int s, e, m = 0; - GLhalfNV result; + GLhalfARB result; /* sign bit */ s = flt_s; @@ -620,7 +620,7 @@ _mesa_float_to_half(float val) * http://www.opengl.org/discussion_boards/ubb/Forum3/HTML/008786.html */ float -_mesa_half_to_float(GLhalfNV val) +_mesa_half_to_float(GLhalfARB val) { /* XXX could also use a 64K-entry lookup table */ const int m = val & 0x3ff; |