summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/bufferobj.c3
-rw-r--r--src/mesa/main/colormac.h2
-rw-r--r--src/mesa/main/colortab.c10
-rw-r--r--src/mesa/main/config.h2
-rw-r--r--src/mesa/main/context.c2
-rw-r--r--src/mesa/main/macros.h3
6 files changed, 9 insertions, 13 deletions
diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index fab1059a18..998228e800 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -383,7 +383,6 @@ _mesa_init_buffer_objects( GLcontext *ctx )
* glGetTexImage, etc) we call this function to check that we're not
* going to read out of bounds.
*
- * \param ctx the rendering context
* \param width width of image to read/write
* \param height height of image to read/write
* \param depth depth of image to read/write
@@ -511,7 +510,7 @@ _mesa_BindBufferARB(GLenum target, GLuint buffer)
* Delete a set of buffer objects.
*
* \param n Number of buffer objects to delete.
- * \param buffer Array of \c n buffer object IDs.
+ * \param ids Array of \c n buffer object IDs.
*/
void GLAPIENTRY
_mesa_DeleteBuffersARB(GLsizei n, const GLuint *ids)
diff --git a/src/mesa/main/colormac.h b/src/mesa/main/colormac.h
index 62b80136e9..a19521fc85 100644
--- a/src/mesa/main/colormac.h
+++ b/src/mesa/main/colormac.h
@@ -221,5 +221,7 @@ do { \
#define PACK_COLOR_233( B, G, R ) \
(((B) & 0xc0) | (((G) & 0xe0) >> 2) | (((R) & 0xe0) >> 5))
+/*@}*/
+
#endif /* COLORMAC_H */
diff --git a/src/mesa/main/colortab.c b/src/mesa/main/colortab.c
index 59cd6ae0c1..382e8cd277 100644
--- a/src/mesa/main/colortab.c
+++ b/src/mesa/main/colortab.c
@@ -175,11 +175,11 @@ set_component_sizes( struct gl_color_table *table )
* Update/replace all or part of a color table. Helper function
* used by _mesa_ColorTable() and _mesa_ColorSubTable().
* The table->Table buffer should already be allocated.
- * \param start - first entry to update
- * \param count - number of entries to update
- * \param format - format of user-provided table data
- * \param type - datatype of user-provided table data
- * \param data - user-provided table data
+ * \param start first entry to update
+ * \param count number of entries to update
+ * \param format format of user-provided table data
+ * \param type datatype of user-provided table data
+ * \param data user-provided table data
* \param [rgba]Scale - RGBA scale factors
* \param [rgba]Bias - RGBA bias factors
*/
diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index c745cbf3be..496997b957 100644
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@ -201,8 +201,6 @@
#define MAX_PROGRAM_MATRIX_STACK_DEPTH 4
/*@}*/
-/*@}*/
-
/**
* \name Mesa-specific parameters
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 0330aa47be..9cb54e41aa 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1607,7 +1607,7 @@ _mesa_destroy_context( GLcontext *ctx )
* \param mask bitwise OR of GL_*_BIT flags
*
* According to the bits specified in \p mask, copies the corresponding
- * attributes from \p src into \dst. For many of the attributes a simple \c
+ * attributes from \p src into \p dst. For many of the attributes a simple \c
* memcpy is not enough due to the existence of internal pointers in their data
* structures.
*/
diff --git a/src/mesa/main/macros.h b/src/mesa/main/macros.h
index 1999758dfb..f13357d391 100644
--- a/src/mesa/main/macros.h
+++ b/src/mesa/main/macros.h
@@ -654,7 +654,4 @@ do { \
#define LEN_SQUARED_2FV( V ) ((V)[0]*(V)[0]+(V)[1]*(V)[1])
-/*@}*/
-
-
#endif