diff options
| author | Karl Schultz <[email protected]> | 2005-05-05 21:08:07 +0000 |
|---|---|---|
| committer | Karl Schultz <[email protected]> | 2005-05-05 21:08:07 +0000 |
| commit | 6258b76c49f49a56a7c713914b798e80c6553b06 (patch) | |
| tree | 2cc86a17fdda506fc9c86daba7ff3900d2d64996 /src/mesa/shader/arbprogram.c | |
| parent | 203dcb733d36cc91107554b0d323ed8ccef6e105 (diff) | |
Port Mesa to build on a P64 platform (e.g., Win64). P64 platforms
use 64-bit pointers and 32-bit longs. So, operations like casting pointers
to unsigned long and back to pointer won't work. glheader.h now
includes files to define uintptr_t, which should instead be used for
this sort of operation. It is an integer type that is the same size
as a pointer.
Diffstat (limited to 'src/mesa/shader/arbprogram.c')
| -rw-r--r-- | src/mesa/shader/arbprogram.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/shader/arbprogram.c b/src/mesa/shader/arbprogram.c index ad8683f00b2..43baab4b0fd 100644 --- a/src/mesa/shader/arbprogram.c +++ b/src/mesa/shader/arbprogram.c @@ -509,7 +509,7 @@ _mesa_GetProgramivARB(GLenum target, GLenum pname, GLint *params) switch (pname) { case GL_PROGRAM_LENGTH_ARB: - *params = prog->String ? _mesa_strlen((char *) prog->String) : 0; + *params = prog->String ? (GLint)_mesa_strlen((char *) prog->String) : 0; break; case GL_PROGRAM_FORMAT_ARB: *params = prog->Format; |