gallium: MSVC fixes.

This commit is contained in:
José Fonseca
2008-02-24 02:16:28 +09:00
parent 58a3d7dfd9
commit e9bb63c8e2
3 changed files with 7 additions and 5 deletions

View File

@@ -616,10 +616,10 @@ aapoint_point(struct draw_stage *stage, struct prim_header *header)
*/ */
#if !NORMALIZE #if !NORMALIZE
k = 1.0 / radius; k = 1.0f / radius;
k = 1.0 - 2.0 * k + k * k; k = 1.0f - 2.0f * k + k * k;
#else #else
k = 1.0 - 1.0 / radius; k = 1.0f - 1.0f / radius;
#endif #endif
/* allocate/dup new verts */ /* allocate/dup new verts */

View File

@@ -285,7 +285,9 @@ fenced_buffer_list_destroy(struct fenced_buffer_list *fenced_list)
/* Wait on outstanding fences */ /* Wait on outstanding fences */
while (fenced_list->numDelayed) { while (fenced_list->numDelayed) {
_glthread_UNLOCK_MUTEX(fenced_list->mutex); _glthread_UNLOCK_MUTEX(fenced_list->mutex);
#ifndef __MSC__
sched_yield(); sched_yield();
#endif
_fenced_buffer_list_check_free(fenced_list, 1); _fenced_buffer_list_check_free(fenced_list, 1);
_glthread_LOCK_MUTEX(fenced_list->mutex); _glthread_LOCK_MUTEX(fenced_list->mutex);
} }

View File

@@ -63,14 +63,14 @@ struct tgsi_exec_machine;
struct sp_fragment_shader { struct sp_fragment_shader {
struct pipe_shader_state 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_exec_machine *machine,
struct tgsi_sampler *samplers); struct tgsi_sampler *samplers);
/* Run the shader - this interface will get cleaned up in the /* Run the shader - this interface will get cleaned up in the
* future: * future:
*/ */
unsigned (*run)( struct sp_fragment_shader *shader, unsigned (*run)( const struct sp_fragment_shader *shader,
struct tgsi_exec_machine *machine, struct tgsi_exec_machine *machine,
struct quad_header *quad ); struct quad_header *quad );