summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2013-07-08 09:59:40 -0600
committerBrian Paul <[email protected]>2013-07-12 08:19:49 -0600
commit721f47227e2c5affded50ea41b33aa050ef6b5b6 (patch)
treefd885f9ee63dac4c3276f852eb044547863395e0
parent528e5b9476a3cccf510e3a7537b3e7d2f869a6a3 (diff)
mesa: add casts to fix MSVC warnings in multisample.c
-rw-r--r--src/mesa/main/multisample.c5
1 files changed, 3 insertions, 2 deletions
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;
}