summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/osmesa/osmesa.c2
-rw-r--r--src/mesa/swrast/s_spantemp.h13
2 files changed, 12 insertions, 3 deletions
diff --git a/src/mesa/drivers/osmesa/osmesa.c b/src/mesa/drivers/osmesa/osmesa.c
index 2d69885277..d88a55056f 100644
--- a/src/mesa/drivers/osmesa/osmesa.c
+++ b/src/mesa/drivers/osmesa/osmesa.c
@@ -602,6 +602,8 @@ osmesa_renderbuffer_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
const OSMesaContext osmesa = OSMESA_CONTEXT(ctx);
/* Note: we can ignoring internalFormat for "window-system" renderbuffers */
+ (void) internalFormat;
+
if (osmesa->format == OSMESA_RGBA) {
rb->GetRow = get_row_RGBA;
rb->GetValues = get_values_RGBA;
diff --git a/src/mesa/swrast/s_spantemp.h b/src/mesa/swrast/s_spantemp.h
index 4ccf031cb2..7c2cae5baf 100644
--- a/src/mesa/swrast/s_spantemp.h
+++ b/src/mesa/swrast/s_spantemp.h
@@ -1,8 +1,8 @@
/*
* Mesa 3-D graphics library
- * Version: 6.3
+ * Version: 6.5.1
*
- * Copyright (C) 1999-2005 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2006 Brian Paul All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -29,7 +29,7 @@
* and PutMonoValues functions.
*
* Define the following macros before including this file:
- * NAME(PREFIX) to generate the function name
+ * NAME(BASE) to generate the function name (i.e. add prefix or suffix)
* FORMAT must be either GL_RGBA, GL_RGBA8 or GL_COLOR_INDEX8_EXT
* SPAN_VARS to declare any local variables
* INIT_PIXEL_PTR(P, X, Y) to initialize a pointer to a pixel
@@ -67,6 +67,7 @@ NAME(get_row)( GLcontext *ctx, struct gl_renderbuffer *rb,
FETCH_PIXEL(dest[i], pixel);
INC_PIXEL_PTR(pixel);
}
+ (void) rb;
}
static void
@@ -88,6 +89,7 @@ NAME(get_values)( GLcontext *ctx, struct gl_renderbuffer *rb,
INIT_PIXEL_PTR(pixel, x[i], y[i]);
FETCH_PIXEL(dest[i], pixel);
}
+ (void) rb;
}
@@ -122,6 +124,7 @@ NAME(put_row)( GLcontext *ctx, struct gl_renderbuffer *rb,
INC_PIXEL_PTR(pixel);
}
}
+ (void) rb;
}
#if (FORMAT == GL_RGBA) || (FORMAT == GL_RGBA8)
@@ -152,6 +155,7 @@ NAME(put_row_rgb)( GLcontext *ctx, struct gl_renderbuffer *rb,
}
INC_PIXEL_PTR(pixel);
}
+ (void) rb;
}
#endif
@@ -186,6 +190,7 @@ NAME(put_mono_row)( GLcontext *ctx, struct gl_renderbuffer *rb,
INC_PIXEL_PTR(pixel);
}
}
+ (void) rb;
}
@@ -212,6 +217,7 @@ NAME(put_values)( GLcontext *ctx, struct gl_renderbuffer *rb,
STORE_PIXEL(pixel, x[i], y[i], src[i]);
}
}
+ (void) rb;
}
@@ -238,6 +244,7 @@ NAME(put_mono_values)( GLcontext *ctx, struct gl_renderbuffer *rb,
STORE_PIXEL(pixel, x[i], y[i], src);
}
}
+ (void) rb;
}