Bring in several forgotten MSVC fixes.

diff --git a/src/gallium/auxiliary/pipebuffer/pb_buffer.h b/src/gallium/auxiliary/pipebuffer/pb_buffer.h
index 97beb5f72a9f39822a3482c3ed3d1c7961c71128..f5b5f4052f8c799713c685f02707438f6ad0ad05 100644 (file)
--- a/src/gallium/auxiliary/pipebuffer/pb_buffer.h
+++ b/src/gallium/auxiliary/pipebuffer/pb_buffer.h
@@ -166,6 +166,7 @@ static INLINE void
 pb_destroy(struct pb_buffer *buf)
 {
    assert(buf);
+   assert(buf->vtbl);
    buf->vtbl->destroy(buf);
 }
 

diff --git a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c
index ff4fd123f36de012a7bd40cd020275e431257095..66256f3fa70b028eb11b3ac3280cb0b9fd9cd47d 100644 (file)
--- a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c
+++ b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c
@@ -192,8 +192,8 @@ mm_bufmgr_create_buffer(struct pb_manager *mgr,
    }
    
    /* Some sanity checks */
-   assert(0 <= mm_buf->block->ofs && mm_buf->block->ofs < mm->size);
-   assert(size <= mm_buf->block->size && mm_buf->block->ofs + mm_buf->block->size <= mm->size);
+   assert(0 <= (unsigned)mm_buf->block->ofs && (unsigned)mm_buf->block->ofs < mm->size);
+   assert(size <= (unsigned)mm_buf->block->size && (unsigned)mm_buf->block->ofs + (unsigned)mm_buf->block->size <= mm->size);
    
    _glthread_UNLOCK_MUTEX(mm->mutex);
    return SUPER(mm_buf);

diff --git a/src/gallium/auxiliary/tgsi/exec/tgsi_exec.c b/src/gallium/auxiliary/tgsi/exec/tgsi_exec.c
index d7b18dc9c59fc77fc6e36966d1c3ff1f8342d808..ac524414001a9296ef0e9c4603168038b4a28fd8 100644 (file)
--- a/src/gallium/auxiliary/tgsi/exec/tgsi_exec.c
+++ b/src/gallium/auxiliary/tgsi/exec/tgsi_exec.c
@@ -2455,7 +2455,7 @@ tgsi_exec_machine_run( struct tgsi_exec_machine *mach )
 
    /* execute instructions, until pc is set to -1 */
    while (pc != -1) {
-      assert(pc < mach->NumInstructions);
+      assert(pc < (int) mach->NumInstructions);
       exec_instruction( mach, mach->Instructions + pc, &pc );
    }
 

diff --git a/src/gallium/auxiliary/tgsi/util/tgsi_dump.c b/src/gallium/auxiliary/tgsi/util/tgsi_dump.c
index b5c54847e0bef7dbec96cdbdc36bbd223baffab6..ff74e6117c4de77a222864fb51c413a0b9e83b41 100644 (file)
--- a/src/gallium/auxiliary/tgsi/util/tgsi_dump.c
+++ b/src/gallium/auxiliary/tgsi/util/tgsi_dump.c
@@ -299,7 +299,8 @@ static const char *TGSI_SEMANTICS[] =
    "SEMANTIC_BCOLOR",
    "SEMANTIC_FOG",
    "SEMANTIC_PSIZE",
-   "SEMANTIC_GENERIC,"
+   "SEMANTIC_GENERIC",
+   "SEMANTIC_NORMAL"
 };
 
 static const char *TGSI_SEMANTICS_SHORT[] =
@@ -310,6 +311,7 @@ static const char *TGSI_SEMANTICS_SHORT[] =
    "FOG",
    "PSIZE",
    "GENERIC",
+   "NORMAL"
 };
 
 static const char *TGSI_IMMS[] =

diff --git a/src/gallium/drivers/softpipe/sp_fs_exec.c b/src/gallium/drivers/softpipe/sp_fs_exec.c
index 8cb0534342da221b3b75179b2c179882e072e135..d5bd7a702f11b96b576ef6c53d3ef55691d00760 100644 (file)
--- a/src/gallium/drivers/softpipe/sp_fs_exec.c
+++ b/src/gallium/drivers/softpipe/sp_fs_exec.c
@@ -81,7 +81,7 @@ sp_setup_pos_vector(const struct tgsi_interp_coef *coef,
 
 
 static void
-exec_prepare( struct sp_fragment_shader *base,
+exec_prepare( const struct sp_fragment_shader *base,
              struct tgsi_exec_machine *machine,
              struct tgsi_sampler *samplers )
 {
@@ -98,7 +98,7 @@ exec_prepare( struct sp_fragment_shader *base,
  * interface:
  */
 static unsigned 
-exec_run( struct sp_fragment_shader *base,
+exec_run( const struct sp_fragment_shader *base,
          struct tgsi_exec_machine *machine,
          struct quad_header *quad )
 {

diff --git a/src/gallium/drivers/softpipe/sp_fs_llvm.c b/src/gallium/drivers/softpipe/sp_fs_llvm.c
index 22da47145334214625ad71982025a1546cd39a9e..34b2b7d4e243db53c519a322eee84d5e6033495e 100644 (file)
--- a/src/gallium/drivers/softpipe/sp_fs_llvm.c
+++ b/src/gallium/drivers/softpipe/sp_fs_llvm.c
@@ -146,7 +146,7 @@ shade_quad_llvm(struct quad_stage *qs,
 
 
 unsigned 
-run_llvm_fs( struct sp_fragment_shader *base,
+run_llvm_fs( const struct sp_fragment_shader *base,
             struct foo *machine )
 {
 }

diff --git a/src/gallium/include/pipe/p_compiler.h b/src/gallium/include/pipe/p_compiler.h
index ab527f2afe3b612002fe773fe1310d72d0f14478..91f3d2ac2d9fefbe6c02222c46d44aec9bf4a009 100644 (file)
--- a/src/gallium/include/pipe/p_compiler.h
+++ b/src/gallium/include/pipe/p_compiler.h
@@ -42,6 +42,14 @@
 #endif
 
 
+#if defined(__MSC__)
+
+/* Avoid 'expression is always true' warning */
+#pragma warning(disable: 4296)
+
+#endif /* __MSC__ */
+
+
 typedef unsigned int       uint;
 typedef unsigned char      ubyte;
 typedef unsigned char      boolean;