summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Fonseca <jrfonseca@tungstengraphics.com>2008-02-24 02:16:28 +0900
committerJosé Fonseca <jrfonseca@tungstengraphics.com>2008-02-24 02:23:12 +0900
commite9bb63c8e20361597463b2f7f88d84fe2770c8b9 (patch)
tree21029410d69a880e5a66961ab9fd34417f370543
parent58a3d7dfd94453c25607106835fbbb3a54d42306 (diff)
gallium: MSVC fixes.
-rw-r--r--src/gallium/auxiliary/draw/draw_aapoint.c6
-rw-r--r--src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c2
-rw-r--r--src/gallium/drivers/softpipe/sp_state.h4
3 files changed, 7 insertions, 5 deletions
diff --git a/src/gallium/auxiliary/draw/draw_aapoint.c b/src/gallium/auxiliary/draw/draw_aapoint.c
index 43119cc70b..27a81f3e90 100644
--- a/src/gallium/auxiliary/draw/draw_aapoint.c
+++ b/src/gallium/auxiliary/draw/draw_aapoint.c
@@ -616,10 +616,10 @@ aapoint_point(struct draw_stage *stage, struct prim_header *header)
*/
#if !NORMALIZE
- k = 1.0 / radius;
- k = 1.0 - 2.0 * k + k * k;
+ k = 1.0f / radius;
+ k = 1.0f - 2.0f * k + k * k;
#else
- k = 1.0 - 1.0 / radius;
+ k = 1.0f - 1.0f / radius;
#endif
/* allocate/dup new verts */
diff --git a/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c b/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
index e2ee72ed1f..6e217eb2e0 100644
--- a/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
+++ b/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
@@ -285,7 +285,9 @@ fenced_buffer_list_destroy(struct fenced_buffer_list *fenced_list)
/* Wait on outstanding fences */
while (fenced_list->numDelayed) {
_glthread_UNLOCK_MUTEX(fenced_list->mutex);
+#ifndef __MSC__
sched_yield();
+#endif
_fenced_buffer_list_check_free(fenced_list, 1);
_glthread_LOCK_MUTEX(fenced_list->mutex);
}
diff --git a/src/gallium/drivers/softpipe/sp_state.h b/src/gallium/drivers/softpipe/sp_state.h
index ef8cf67d4c..6ff31e601f 100644
--- a/src/gallium/drivers/softpipe/sp_state.h
+++ b/src/gallium/drivers/softpipe/sp_state.h
@@ -63,14 +63,14 @@ struct tgsi_exec_machine;
struct sp_fragment_shader {
struct pipe_shader_state shader;
- void (*prepare)( struct sp_fragment_shader *shader,
+ void (*prepare)( const struct sp_fragment_shader *shader,
struct tgsi_exec_machine *machine,
struct tgsi_sampler *samplers);
/* Run the shader - this interface will get cleaned up in the
* future:
*/
- unsigned (*run)( struct sp_fragment_shader *shader,
+ unsigned (*run)( const struct sp_fragment_shader *shader,
struct tgsi_exec_machine *machine,
struct quad_header *quad );