diff options
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_state.c | 7 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_common.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_common.h | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_state.c | 7 |
4 files changed, 14 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_state.c b/src/mesa/drivers/dri/r200/r200_state.c index d3e811407be..ee7b9459664 100644 --- a/src/mesa/drivers/dri/r200/r200_state.c +++ b/src/mesa/drivers/dri/r200/r200_state.c @@ -1603,13 +1603,18 @@ void r200_vtbl_update_scissor( struct gl_context *ctx ) static void r200Viewport( struct gl_context *ctx, GLint x, GLint y, GLsizei width, GLsizei height ) { + (void) x; + (void) y; + (void) width; + (void) height; + /* Don't pipeline viewport changes, conflict with window offset * setting below. Could apply deltas to rescue pipelined viewport * values, or keep the originals hanging around. */ r200UpdateWindow( ctx ); - radeon_viewport(ctx, x, y, width, height); + radeon_viewport(ctx); } static void r200DepthRange( struct gl_context *ctx, GLclampd nearval, diff --git a/src/mesa/drivers/dri/radeon/radeon_common.c b/src/mesa/drivers/dri/radeon/radeon_common.c index 0f0945da981..7be0ba732a6 100644 --- a/src/mesa/drivers/dri/radeon/radeon_common.c +++ b/src/mesa/drivers/dri/radeon/radeon_common.c @@ -407,7 +407,7 @@ void radeon_window_moved(radeonContextPtr radeon) radeonSetCliprects(radeon); } -void radeon_viewport(struct gl_context *ctx, GLint x, GLint y, GLsizei width, GLsizei height) +void radeon_viewport(struct gl_context *ctx) { radeonContextPtr radeon = RADEON_CONTEXT(ctx); __DRIcontext *driContext = radeon->dri.context; diff --git a/src/mesa/drivers/dri/radeon/radeon_common.h b/src/mesa/drivers/dri/radeon/radeon_common.h index 636822faed2..69a17278abf 100644 --- a/src/mesa/drivers/dri/radeon/radeon_common.h +++ b/src/mesa/drivers/dri/radeon/radeon_common.h @@ -23,7 +23,7 @@ void radeon_window_moved(radeonContextPtr radeon); void radeon_draw_buffer(struct gl_context *ctx, struct gl_framebuffer *fb); void radeonDrawBuffer( struct gl_context *ctx, GLenum mode ); void radeonReadBuffer( struct gl_context *ctx, GLenum mode ); -void radeon_viewport(struct gl_context *ctx, GLint x, GLint y, GLsizei width, GLsizei height); +void radeon_viewport(struct gl_context *ctx); void radeon_fbo_init(struct radeon_context *radeon); void radeon_renderbuffer_set_bo(struct radeon_renderbuffer *rb, diff --git a/src/mesa/drivers/dri/radeon/radeon_state.c b/src/mesa/drivers/dri/radeon/radeon_state.c index 70542f68a19..625271dd168 100644 --- a/src/mesa/drivers/dri/radeon/radeon_state.c +++ b/src/mesa/drivers/dri/radeon/radeon_state.c @@ -1386,13 +1386,18 @@ void radeonUpdateWindow( struct gl_context *ctx ) static void radeonViewport( struct gl_context *ctx, GLint x, GLint y, GLsizei width, GLsizei height ) { + (void) x; + (void) y; + (void) width; + (void) height; + /* Don't pipeline viewport changes, conflict with window offset * setting below. Could apply deltas to rescue pipelined viewport * values, or keep the originals hanging around. */ radeonUpdateWindow( ctx ); - radeon_viewport(ctx, x, y, width, height); + radeon_viewport(ctx); } static void radeonDepthRange( struct gl_context *ctx, GLclampd nearval, |