diff options
| -rw-r--r-- | src/mesa/main/texcompress_etc.c | 22 | ||||
| -rw-r--r-- | src/mesa/main/texstore.h | 18 |
2 files changed, 27 insertions, 13 deletions
diff --git a/src/mesa/main/texcompress_etc.c b/src/mesa/main/texcompress_etc.c index d4650109857..faeaae90937 100644 --- a/src/mesa/main/texcompress_etc.c +++ b/src/mesa/main/texcompress_etc.c @@ -105,7 +105,7 @@ static const int etc2_modifier_tables_non_opaque[8][4] = { #undef UINT8_TYPE GLboolean -_mesa_texstore_etc1_rgb8(TEXSTORE_PARAMS) +_mesa_texstore_etc1_rgb8(UNUSED_TEXSTORE_PARAMS) { /* GL_ETC1_RGB8_OES is only valid in glCompressedTexImage2D */ assert(0); @@ -1097,7 +1097,7 @@ etc2_unpack_srgb8_punchthrough_alpha1(uint8_t *dst_row, /* ETC2 texture formats are valid in glCompressedTexImage2D and * glCompressedTexSubImage2D functions */ GLboolean -_mesa_texstore_etc2_rgb8(TEXSTORE_PARAMS) +_mesa_texstore_etc2_rgb8(UNUSED_TEXSTORE_PARAMS) { assert(0); @@ -1105,7 +1105,7 @@ _mesa_texstore_etc2_rgb8(TEXSTORE_PARAMS) } GLboolean -_mesa_texstore_etc2_srgb8(TEXSTORE_PARAMS) +_mesa_texstore_etc2_srgb8(UNUSED_TEXSTORE_PARAMS) { assert(0); @@ -1113,7 +1113,7 @@ _mesa_texstore_etc2_srgb8(TEXSTORE_PARAMS) } GLboolean -_mesa_texstore_etc2_rgba8_eac(TEXSTORE_PARAMS) +_mesa_texstore_etc2_rgba8_eac(UNUSED_TEXSTORE_PARAMS) { assert(0); @@ -1121,7 +1121,7 @@ _mesa_texstore_etc2_rgba8_eac(TEXSTORE_PARAMS) } GLboolean -_mesa_texstore_etc2_srgb8_alpha8_eac(TEXSTORE_PARAMS) +_mesa_texstore_etc2_srgb8_alpha8_eac(UNUSED_TEXSTORE_PARAMS) { assert(0); @@ -1129,7 +1129,7 @@ _mesa_texstore_etc2_srgb8_alpha8_eac(TEXSTORE_PARAMS) } GLboolean -_mesa_texstore_etc2_r11_eac(TEXSTORE_PARAMS) +_mesa_texstore_etc2_r11_eac(UNUSED_TEXSTORE_PARAMS) { assert(0); @@ -1137,7 +1137,7 @@ _mesa_texstore_etc2_r11_eac(TEXSTORE_PARAMS) } GLboolean -_mesa_texstore_etc2_signed_r11_eac(TEXSTORE_PARAMS) +_mesa_texstore_etc2_signed_r11_eac(UNUSED_TEXSTORE_PARAMS) { assert(0); @@ -1145,7 +1145,7 @@ _mesa_texstore_etc2_signed_r11_eac(TEXSTORE_PARAMS) } GLboolean -_mesa_texstore_etc2_rg11_eac(TEXSTORE_PARAMS) +_mesa_texstore_etc2_rg11_eac(UNUSED_TEXSTORE_PARAMS) { assert(0); @@ -1153,7 +1153,7 @@ _mesa_texstore_etc2_rg11_eac(TEXSTORE_PARAMS) } GLboolean -_mesa_texstore_etc2_signed_rg11_eac(TEXSTORE_PARAMS) +_mesa_texstore_etc2_signed_rg11_eac(UNUSED_TEXSTORE_PARAMS) { assert(0); @@ -1161,7 +1161,7 @@ _mesa_texstore_etc2_signed_rg11_eac(TEXSTORE_PARAMS) } GLboolean -_mesa_texstore_etc2_rgb8_punchthrough_alpha1(TEXSTORE_PARAMS) +_mesa_texstore_etc2_rgb8_punchthrough_alpha1(UNUSED_TEXSTORE_PARAMS) { assert(0); @@ -1169,7 +1169,7 @@ _mesa_texstore_etc2_rgb8_punchthrough_alpha1(TEXSTORE_PARAMS) } GLboolean -_mesa_texstore_etc2_srgb8_punchthrough_alpha1(TEXSTORE_PARAMS) +_mesa_texstore_etc2_srgb8_punchthrough_alpha1(UNUSED_TEXSTORE_PARAMS) { assert(0); diff --git a/src/mesa/main/texstore.h b/src/mesa/main/texstore.h index f08dc08edde..b8281c51e2a 100644 --- a/src/mesa/main/texstore.h +++ b/src/mesa/main/texstore.h @@ -56,8 +56,8 @@ */ #define TEXSTORE_PARAMS \ struct gl_context *ctx, GLuint dims, \ - GLenum baseInternalFormat, \ - mesa_format dstFormat, \ + MAYBE_UNUSED GLenum baseInternalFormat, \ + MAYBE_UNUSED mesa_format dstFormat, \ GLint dstRowStride, \ GLubyte **dstSlices, \ GLint srcWidth, GLint srcHeight, GLint srcDepth, \ @@ -65,6 +65,20 @@ const GLvoid *srcAddr, \ const struct gl_pixelstore_attrib *srcPacking +/* This macro must be kept in sync with TEXSTORE_PARAMS. It is used in the + * few places where none of the parameters are used (i.e., the ETC texstore + * functions). + */ +#define UNUSED_TEXSTORE_PARAMS \ + UNUSED struct gl_context *ctx, UNUSED GLuint dims, \ + UNUSED GLenum baseInternalFormat, \ + UNUSED mesa_format dstFormat, \ + UNUSED GLint dstRowStride, \ + UNUSED GLubyte **dstSlices, \ + UNUSED GLint srcWidth, UNUSED GLint srcHeight, UNUSED GLint srcDepth, \ + UNUSED GLenum srcFormat, UNUSED GLenum srcType, \ + UNUSED const GLvoid *srcAddr, \ + UNUSED const struct gl_pixelstore_attrib *srcPacking extern GLboolean _mesa_texstore(TEXSTORE_PARAMS); |