From: Brian Paul <brianp@vmware.com>
Date: Mon, 8 Jul 2013 15:59:40 +0000 (-0600)
Subject: mesa: add casts to fix MSVC warnings in multisample.c
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=721f47227e2c5affded50ea41b33aa050ef6b5b6;p=mesa.git

mesa: add casts to fix MSVC warnings in multisample.c
---

diff --git a/src/mesa/main/multisample.c b/src/mesa/main/multisample.c
index 8b974c1b707..bd97c50960e 100644
--- a/src/mesa/main/multisample.c
+++ b/src/mesa/main/multisample.c
@@ -80,7 +80,7 @@ _mesa_GetMultisamplefv(GLenum pname, GLuint index, GLfloat * val)
 
    switch (pname) {
    case GL_SAMPLE_POSITION: {
-      if (index >= ctx->DrawBuffer->Visual.samples) {
+      if ((int) index >= ctx->DrawBuffer->Visual.samples) {
          _mesa_error( ctx, GL_INVALID_VALUE, "glGetMultisamplefv(index)" );
          return;
       }
@@ -197,5 +197,6 @@ _mesa_check_sample_count(struct gl_context *ctx, GLenum target,
     * "... or if samples is greater than MAX_SAMPLES, then the error
     * INVALID_VALUE is generated"
     */
-   return samples > ctx->Const.MaxSamples ? GL_INVALID_VALUE : GL_NO_ERROR;
+   return (GLuint) samples > ctx->Const.MaxSamples
+      ? GL_INVALID_VALUE : GL_NO_ERROR;
 }