summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/pipe/i915simple/i915_context.c2
-rw-r--r--src/mesa/pipe/i915simple/i915_state_sampler.c2
-rw-r--r--src/mesa/pipe/softpipe/sp_context.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/pipe/i915simple/i915_context.c b/src/mesa/pipe/i915simple/i915_context.c
index 715e1ef656..89252e38d5 100644
--- a/src/mesa/pipe/i915simple/i915_context.c
+++ b/src/mesa/pipe/i915simple/i915_context.c
@@ -139,7 +139,7 @@ i915_max_texture_size(struct pipe_context *pipe, unsigned textureType,
static int
-i915_get_param(struct pipe_context *pipe, uint param)
+i915_get_param(struct pipe_context *pipe, int param)
{
switch (param) {
case PIPE_PARAM_FS_NEEDS_POS:
diff --git a/src/mesa/pipe/i915simple/i915_state_sampler.c b/src/mesa/pipe/i915simple/i915_state_sampler.c
index ebfd29fadb..e6623f4356 100644
--- a/src/mesa/pipe/i915simple/i915_state_sampler.c
+++ b/src/mesa/pipe/i915simple/i915_state_sampler.c
@@ -240,7 +240,7 @@ i915_update_texture(struct i915_context *i915, uint unit,
{
- struct pipe_buffer_handle *p = driBOReference(mt->region->buffer);
+ /*struct pipe_buffer_handle *p =*/ driBOReference(mt->region->buffer);
}
#if 0
diff --git a/src/mesa/pipe/softpipe/sp_context.c b/src/mesa/pipe/softpipe/sp_context.c
index ebd5530950..cac44606f7 100644
--- a/src/mesa/pipe/softpipe/sp_context.c
+++ b/src/mesa/pipe/softpipe/sp_context.c
@@ -236,7 +236,7 @@ static const char *softpipe_get_vendor( struct pipe_context *pipe )
return "Tungsten Graphics, Inc.";
}
-static int softpipe_get_param(struct pipe_context *pipe, uint param)
+static int softpipe_get_param(struct pipe_context *pipe, int param)
{
switch (param) {
case PIPE_PARAM_FS_NEEDS_POS: