summaryrefslogtreecommitdiffstats
path: root/src/gallium/auxiliary/draw/draw_pt_vcache_tmp.h
diff options
context:
space:
mode:
authorJosé Fonseca <jrfonseca@tungstengraphics.com>2008-05-29 22:26:56 +0900
committerJosé Fonseca <jrfonseca@tungstengraphics.com>2008-05-29 22:28:12 +0900
commit8808d62f608d1397ee75d0087301d0b0a0278244 (patch)
tree78efee7c0ace52f2c76027ccc797cc4971ede496 /src/gallium/auxiliary/draw/draw_pt_vcache_tmp.h
parent4a7198fdcfe3256bdefff5d1d766327ae7f18b35 (diff)
downloadexternal_mesa3d-8808d62f608d1397ee75d0087301d0b0a0278244.zip
external_mesa3d-8808d62f608d1397ee75d0087301d0b0a0278244.tar.gz
external_mesa3d-8808d62f608d1397ee75d0087301d0b0a0278244.tar.bz2
gallium: MSVC warning fixes.
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
Diffstat (limited to 'src/gallium/auxiliary/draw/draw_pt_vcache_tmp.h')
-rw-r--r--src/gallium/auxiliary/draw/draw_pt_vcache_tmp.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/gallium/auxiliary/draw/draw_pt_vcache_tmp.h b/src/gallium/auxiliary/draw/draw_pt_vcache_tmp.h
index cf9f394..5c99a47 100644
--- a/src/gallium/auxiliary/draw/draw_pt_vcache_tmp.h
+++ b/src/gallium/auxiliary/draw/draw_pt_vcache_tmp.h
@@ -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;