fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 19:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

gallium: Silence MSVC warnings.

Browse source
This commit is contained in:
José Fonseca 2008-03-11 23:51:27 +00:00
parent 45c5989511
commit 21ff003061
3 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/gallium/auxiliary/util/u_snprintf.c
View file

@ -241,7 +241,6 @@ static void *mymemcpy(void *, void *, size_t);
#endif /* !HAVE_VASPRINTF */
#if !HAVE_VSNPRINTF
#include <errno.h> /* For ERANGE and errno. */
#include <limits.h> /* For *_MAX. */
#if HAVE_INTTYPES_H
#include <inttypes.h> /* For intmax_t (if not defined in <stdint.h>). */
@ -445,8 +444,6 @@ static UINTMAX_T cast(LDOUBLE);
static UINTMAX_T myround(LDOUBLE);
static LDOUBLE mypow10(int);
extern int errno;
int
rpl_vsnprintf(char *str, size_t size, const char *format, va_list args)
{
@ -747,7 +744,7 @@ rpl_vsnprintf(char *str, size_t size, const char *format, va_list args)
goto out;
break;
case 'c':
cvalue = va_arg(args, int);
cvalue = (unsigned char)va_arg(args, int);
OUTCHAR(str, len, size, cvalue);
break;
case 's':
@ -844,7 +841,6 @@ out:
str[size - 1] = '\0';
if (overflow || len >= INT_MAX) {
errno = overflow ? EOVERFLOW : ERANGE;
return -1;
}
return (int)len;
@ -1106,7 +1102,7 @@ again:
* Factor of ten with the number of digits needed for the fractional
* part. For example, if the precision is 3, the mask will be 1000.
*/
mask = mypow10(precision);
mask = (UINTMAX_T)mypow10(precision);
/*
* We "cheat" by converting the fractional part to integer by
* multiplying by a factor of ten.
@ -1358,7 +1354,7 @@ cast(LDOUBLE value)
if (value >= UINTMAX_MAX)
return UINTMAX_MAX;
result = value;
result = (UINTMAX_T)value;
/*
* At least on NetBSD/sparc64 3.0.2 and 4.99.30, casting long double to
* an integer type converts e.g. 1.9 to 2 instead of 1 (which violates

7
src/gallium/drivers/i915simple/i915_state.c
View file

@ -273,6 +273,7 @@ static void i915_bind_sampler_states(struct pipe_context *pipe,
unsigned num, void **sampler)
{
struct i915_context *i915 = i915_context(pipe);
unsigned i;
assert(num <= PIPE_MAX_SAMPLERS);
@ -281,8 +282,10 @@ static void i915_bind_sampler_states(struct pipe_context *pipe,
!memcmp(i915->sampler, sampler, num * sizeof(void *)))
return;
memcpy(i915->sampler, sampler, num * sizeof(void *));
memset(&i915->sampler[num], 0, (PIPE_MAX_SAMPLERS - num) * sizeof(void *));
for (i = 0; i < num; ++i)
i915->sampler[i] = sampler[i];
for (i = num; i < PIPE_MAX_SAMPLERS; ++i)
i915->sampler[i] = NULL;
i915->num_samplers = num;

8
src/gallium/drivers/softpipe/sp_state_sampler.c
View file

@ -56,6 +56,7 @@ softpipe_bind_sampler_states(struct pipe_context *pipe,
unsigned num, void **sampler)
{
struct softpipe_context *softpipe = softpipe_context(pipe);
unsigned i;
assert(num <= PIPE_MAX_SAMPLERS);
@ -66,9 +67,10 @@ softpipe_bind_sampler_states(struct pipe_context *pipe,
draw_flush(softpipe->draw);
memcpy(softpipe->sampler, sampler, num * sizeof(void *));
memset(&softpipe->sampler[num], 0, (PIPE_MAX_SAMPLERS - num) *
sizeof(void *));
for (i = 0; i < num; ++i)
softpipe->sampler[i] = sampler[i];
for (i = num; i < PIPE_MAX_SAMPLERS; ++i)
softpipe->sampler[i] = NULL;
softpipe->num_samplers = num;