swrast: s/GLint/GLuint/ to silence MSVC signed/unsigned comparison warning

[mesa.git] / src / mesa / x86 / read_rgba_span_x86.S

diff --git a/src/mesa/x86/read_rgba_span_x86.S b/src/mesa/x86/read_rgba_span_x86.S
index 80144b889c72e5b41c12c6934cfeed2eab5a7295..3be4515b114f94f53638c93aa391d4bacc52ffc2 100644 (file)
--- a/src/mesa/x86/read_rgba_span_x86.S
+++ b/src/mesa/x86/read_rgba_span_x86.S
@@ -31,7 +31,7 @@
  */
 
        .file   "read_rgba_span_x86.S"
-#if !defined(__DJGPP__) && !defined(__MINGW32__) /* this one cries for assyntax.h */
+#if !defined(__DJGPP__) && !defined(__MINGW32__) && !defined(__APPLE__) /* this one cries for assyntax.h */
 /* Kevin F. Quinn 2nd July 2006
  * Replaced data segment constants with text-segment instructions.
  */
@@ -77,7 +77,9 @@
  */
 
 .globl _generic_read_RGBA_span_BGRA8888_REV_MMX
+#ifndef USE_DRICORE
 .hidden _generic_read_RGBA_span_BGRA8888_REV_MMX
+#endif
        .type   _generic_read_RGBA_span_BGRA8888_REV_MMX, @function
 _generic_read_RGBA_span_BGRA8888_REV_MMX:
        pushl   %ebx
@@ -172,7 +174,9 @@ _generic_read_RGBA_span_BGRA8888_REV_MMX:
  */
 
 .globl _generic_read_RGBA_span_BGRA8888_REV_SSE
+#ifndef USE_DRICORE
 .hidden _generic_read_RGBA_span_BGRA8888_REV_SSE
+#endif
        .type   _generic_read_RGBA_span_BGRA8888_REV_SSE, @function
 _generic_read_RGBA_span_BGRA8888_REV_SSE:
        pushl   %esi
@@ -335,7 +339,9 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE:
 
        .text
 .globl _generic_read_RGBA_span_BGRA8888_REV_SSE2
+#ifndef USE_DRICORE
 .hidden _generic_read_RGBA_span_BGRA8888_REV_SSE2
+#endif
        .type   _generic_read_RGBA_span_BGRA8888_REV_SSE2, @function
 _generic_read_RGBA_span_BGRA8888_REV_SSE2:
        pushl   %esi
@@ -494,7 +500,9 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE2:
 
        .text
        .globl  _generic_read_RGBA_span_RGB565_MMX
+#ifndef USE_DRICORE
         .hidden _generic_read_RGBA_span_RGB565_MMX
+#endif
        .type   _generic_read_RGBA_span_RGB565_MMX, @function
 
 _generic_read_RGBA_span_RGB565_MMX:
@@ -522,7 +530,7 @@ _generic_read_RGBA_span_RGB565_MMX:
        addl    $32,%esp
 
        sarl    $2, %ecx
-       jle     .L01            /* Bail early if the count is negative. */
+       jl      .L01            /* Bail early if the count is negative. */
        jmp     .L02
 
 .L03:
@@ -648,7 +656,7 @@ _generic_read_RGBA_span_RGB565_MMX:
        testl   $0x01, %ecx
        je      .L01
 
-       movzxw  (%eax), %ecx
+       movzwl  (%eax), %ecx
        movd    %ecx, %mm4
 
        pshufw  $0x00, %mm4, %mm0
@@ -671,7 +679,7 @@ _generic_read_RGBA_span_RGB565_MMX:
        emms
 #endif
        ret
-#endif /* !defined(__DJGPP__) && !defined(__MINGW32__) */
+#endif /* !defined(__DJGPP__) && !defined(__MINGW32__) && !defined(__APPLE__) */
        
 #if defined (__ELF__) && defined (__linux__)
        .section .note.GNU-stack,"",%progbits