diff options
| -rw-r--r-- | src/mesa/main/context.c | 4 | ||||
| -rw-r--r-- | src/mesa/main/context.h | 4 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 2 | ||||
| -rw-r--r-- | src/mesa/main/multisample.c | 2 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_cb_fbo.c | 2 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_cb_fbo.h | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index 53261fea51b..a52c98112e0 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -227,7 +227,7 @@ _mesa_create_visual( GLboolean dbFlag, GLint accumGreenBits, GLint accumBlueBits, GLint accumAlphaBits, - GLint numSamples ) + GLuint numSamples ) { struct gl_config *vis = CALLOC_STRUCT(gl_config); if (vis) { @@ -269,7 +269,7 @@ _mesa_initialize_visual( struct gl_config *vis, GLint accumGreenBits, GLint accumBlueBits, GLint accumAlphaBits, - GLint numSamples ) + GLuint numSamples ) { assert(vis); diff --git a/src/mesa/main/context.h b/src/mesa/main/context.h index 17fb86c3239..5d9e2ede473 100644 --- a/src/mesa/main/context.h +++ b/src/mesa/main/context.h @@ -79,7 +79,7 @@ _mesa_create_visual( GLboolean dbFlag, GLint accumGreenBits, GLint accumBlueBits, GLint accumAlphaBits, - GLint numSamples ); + GLuint numSamples ); extern GLboolean _mesa_initialize_visual( struct gl_config *v, @@ -95,7 +95,7 @@ _mesa_initialize_visual( struct gl_config *v, GLint accumGreenBits, GLint accumBlueBits, GLint accumAlphaBits, - GLint numSamples ); + GLuint numSamples ); extern void _mesa_destroy_visual( struct gl_config *vis ); diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 1f1792e4263..af67d59feff 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -242,7 +242,7 @@ struct gl_config /* ARB_multisample / SGIS_multisample */ GLint sampleBuffers; - GLint samples; + GLuint samples; /* SGIX_pbuffer / GLX 1.3 */ GLint maxPbufferWidth; diff --git a/src/mesa/main/multisample.c b/src/mesa/main/multisample.c index 8ede94b7458..dfe6a371427 100644 --- a/src/mesa/main/multisample.c +++ b/src/mesa/main/multisample.c @@ -87,7 +87,7 @@ _mesa_GetMultisamplefv(GLenum pname, GLuint index, GLfloat * val) switch (pname) { case GL_SAMPLE_POSITION: { - if ((int) index >= ctx->DrawBuffer->Visual.samples) { + if (index >= ctx->DrawBuffer->Visual.samples) { _mesa_error( ctx, GL_INVALID_VALUE, "glGetMultisamplefv(index)" ); return; } diff --git a/src/mesa/state_tracker/st_cb_fbo.c b/src/mesa/state_tracker/st_cb_fbo.c index a982f87b608..3a5c03c3354 100644 --- a/src/mesa/state_tracker/st_cb_fbo.c +++ b/src/mesa/state_tracker/st_cb_fbo.c @@ -268,7 +268,7 @@ st_new_renderbuffer(struct gl_context *ctx, GLuint name) * renderbuffer). The window system code determines the format. */ struct gl_renderbuffer * -st_new_renderbuffer_fb(enum pipe_format format, int samples, boolean sw) +st_new_renderbuffer_fb(enum pipe_format format, unsigned samples, boolean sw) { struct st_renderbuffer *strb; diff --git a/src/mesa/state_tracker/st_cb_fbo.h b/src/mesa/state_tracker/st_cb_fbo.h index 02dee865763..345c11442c6 100644 --- a/src/mesa/state_tracker/st_cb_fbo.h +++ b/src/mesa/state_tracker/st_cb_fbo.h @@ -102,7 +102,7 @@ st_ws_framebuffer(struct gl_framebuffer *fb) extern struct gl_renderbuffer * -st_new_renderbuffer_fb(enum pipe_format format, int samples, boolean sw); +st_new_renderbuffer_fb(enum pipe_format format, unsigned samples, boolean sw); extern void st_update_renderbuffer_surface(struct st_context *st, |