fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 09:08:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

gallium: MSVC warning fixes.

Browse source 
Conflicts:

	src/gallium/auxiliary/draw/draw_pt_varray.c
	src/gallium/auxiliary/draw/draw_pt_varray_tmp.h
	src/gallium/auxiliary/draw/draw_pt_vcache.c
This commit is contained in:
José Fonseca 2008-05-29 22:26:56 +09:00
parent 4a7198fdcf
commit 8808d62f60
5 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/auxiliary/draw/draw_pipe_vbuf.c
View file

@ -145,7 +145,7 @@ emit_vertex( struct vbuf_stage *vbuf,
vertex->vertex_id = vbuf->nr_vertices++;
}
return vertex->vertex_id;
return (ushort)vertex->vertex_id;
}

9
src/gallium/auxiliary/draw/draw_pt_varray_tmp.h
View file

@ -10,7 +10,8 @@ static void FUNC(struct draw_pt_front_end *frontend,
boolean flatfirst = (draw->rasterizer->flatshade &&
draw->rasterizer->flatshade_first);
unsigned i, j, flags;
unsigned i, j;
ushort flags;
unsigned first, incr;
varray->fetch_start = start;
@ -200,9 +201,9 @@ static void FUNC(struct draw_pt_front_end *frontend,
/* These bitflags look a little odd because we submit the
* vertices as (1,2,0) to satisfy flatshade requirements.
*/
const unsigned edge_first = DRAW_PIPE_EDGE_FLAG_2;
const unsigned edge_middle = DRAW_PIPE_EDGE_FLAG_0;
const unsigned edge_last = DRAW_PIPE_EDGE_FLAG_1;
const ushort edge_first = DRAW_PIPE_EDGE_FLAG_2;
const ushort edge_middle = DRAW_PIPE_EDGE_FLAG_0;
const ushort edge_last = DRAW_PIPE_EDGE_FLAG_1;
flags = DRAW_PIPE_RESET_STIPPLE | edge_first | edge_middle;
for (j = 0; j + first <= count; j += i) {

9
src/gallium/auxiliary/draw/draw_pt_vcache_tmp.h
View file

@ -10,7 +10,8 @@ static void FUNC( struct draw_pt_front_end *frontend,
boolean flatfirst = (draw->rasterizer->flatshade &&
draw->rasterizer->flatshade_first);
unsigned i, flags;
unsigned i;
ushort flags;
switch (vcache->input_prim) {
@ -138,9 +139,9 @@ static void FUNC( struct draw_pt_front_end *frontend,
/* These bitflags look a little odd because we submit the
* vertices as (1,2,0) to satisfy flatshade requirements.
*/
const unsigned edge_first = DRAW_PIPE_EDGE_FLAG_2;
const unsigned edge_middle = DRAW_PIPE_EDGE_FLAG_0;
const unsigned edge_last = DRAW_PIPE_EDGE_FLAG_1;
const ushort edge_first = DRAW_PIPE_EDGE_FLAG_2;
const ushort edge_middle = DRAW_PIPE_EDGE_FLAG_0;
const ushort edge_last = DRAW_PIPE_EDGE_FLAG_1;
flags = DRAW_PIPE_RESET_STIPPLE | edge_first | edge_middle;

2
src/gallium/auxiliary/tgsi/exec/tgsi_sse2.c
View file

@ -198,7 +198,7 @@ get_coef(
static void
emit_retw(
struct x86_function *func,
unsigned size )
unsigned short size )
{
x86_retw( func, size );
}

2
src/gallium/auxiliary/translate/translate_sse.c
View file

@ -309,7 +309,7 @@ static void get_src_ptr( struct translate_sse *p,
static void emit_swizzle( struct translate_sse *p,
struct x86_reg dest,
struct x86_reg src,
unsigned shuffle )
unsigned char shuffle )
{
sse_shufps(p->func, dest, src, shuffle);
}