Mesa (master): radeon / r200: Fix incompatible pointer type warning

Ian Romanick idr at kemper.freedesktop.org
Thu Jan 23 17:00:39 UTC 2014


Module: Mesa
Branch: master
Commit: b790bed21e332cfe0b999dfa9988ae5168557a0c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b790bed21e332cfe0b999dfa9988ae5168557a0c

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Mon Jan 20 10:41:31 2014 -0800

radeon / r200: Fix incompatible pointer type warning

When parameters were removed from dd_function_table::Viewport (commit
065bd6ff), radeon_viewport (in both radeon and r200) started generating
a warning.

radeon_common.c: In function 'r200_radeon_viewport':
radeon_common.c:415:15: warning: assignment from incompatible pointer type [enabled by default]
radeon_common.c:419:23: warning: assignment from incompatible pointer type [enabled by default]

I didn't notice this initially, and it's harmless because the function is
never called through the incorrectly typed pointer.

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
Cc: Marek Olšák <marek.olsak at amd.com>

---

 src/mesa/drivers/dri/radeon/radeon_common.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/radeon/radeon_common.c b/src/mesa/drivers/dri/radeon/radeon_common.c
index e900bc5..d8839d1 100644
--- a/src/mesa/drivers/dri/radeon/radeon_common.c
+++ b/src/mesa/drivers/dri/radeon/radeon_common.c
@@ -400,8 +400,7 @@ void radeon_viewport(struct gl_context *ctx)
 {
 	radeonContextPtr radeon = RADEON_CONTEXT(ctx);
 	__DRIcontext *driContext = radeon->dri.context;
-	void (*old_viewport)(struct gl_context *ctx, GLint x, GLint y,
-			     GLsizei w, GLsizei h);
+	void (*old_viewport)(struct gl_context *ctx);
 
 	if (_mesa_is_winsys_fbo(ctx->DrawBuffer)) {
 		if (radeon->is_front_buffer_rendering) {




More information about the mesa-commit mailing list