Mesa (master): mesa: add casts to fix MSVC warnings in multisample.c
Brian Paul
brianp at kemper.freedesktop.org
Fri Jul 12 14:31:12 UTC 2013
Module: Mesa
Branch: master
Commit: 721f47227e2c5affded50ea41b33aa050ef6b5b6
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=721f47227e2c5affded50ea41b33aa050ef6b5b6
Author: Brian Paul <brianp at vmware.com>
Date: Mon Jul 8 09:59:40 2013 -0600
mesa: add casts to fix MSVC warnings in multisample.c
---
src/mesa/main/multisample.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/mesa/main/multisample.c b/src/mesa/main/multisample.c
index 8b974c1..bd97c50 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;
}
More information about the mesa-commit
mailing list