From abd962f1d5e0991073312305560516a3e64ef1cb Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Fri, 1 Nov 2013 11:36:47 -0700 Subject: [PATCH] i965: Eliminate the saved_viewport wrapper The i965 driver never installed a dd_function_table::Viewport function, so this wrapper never actually did anything. No piglit regressions on IVB on DRI2. Signed-off-by: Ian Romanick Reviewed-by: Jordan Justen Cc: Courtney Goeltzenleuchter --- src/mesa/drivers/dri/i965/brw_context.c | 10 +++++----- src/mesa/drivers/dri/i965/brw_context.h | 2 -- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index 13569add74d..1f4fbbfb653 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -130,8 +130,10 @@ intel_viewport(struct gl_context *ctx, GLint x, GLint y, GLsizei w, GLsizei h) struct brw_context *brw = brw_context(ctx); __DRIcontext *driContext = brw->driContext; - if (brw->saved_viewport) - brw->saved_viewport(ctx, x, y, w, h); + (void) x; + (void) y; + (void) w; + (void) h; if (_mesa_is_winsys_fbo(ctx->DrawBuffer)) { dri2InvalidateDrawable(driContext->driDrawablePriv); @@ -220,10 +222,8 @@ brw_init_driver_functions(struct brw_context *brw, * So EGL still relies on viewport hacks to handle window resizing. * This should go away with DRI3000. */ - if (!brw->driContext->driScreenPriv->dri2.useInvalidate) { - brw->saved_viewport = functions->Viewport; + if (!brw->driContext->driScreenPriv->dri2.useInvalidate) functions->Viewport = intel_viewport; - } functions->Flush = intel_glFlush; functions->Finish = intelFinish; diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h index bec4d6b5541..e1f73ae8bbb 100644 --- a/src/mesa/drivers/dri/i965/brw_context.h +++ b/src/mesa/drivers/dri/i965/brw_context.h @@ -1442,8 +1442,6 @@ struct brw_context __DRIcontext *driContext; struct intel_screen *intelScreen; - void (*saved_viewport)(struct gl_context *ctx, - GLint x, GLint y, GLsizei width, GLsizei height); }; static INLINE bool -- 2.30.2