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 <ian.d.romanick@intel.com>
Reviewed-by: Jordan Justen <jljusten@gmail.com>
Cc: Courtney Goeltzenleuchter <courtney@lunarg.com>
This commit is contained in:
Ian Romanick 2013-11-01 11:36:47 -07:00
parent 1c7605685d
commit abd962f1d5
2 changed files with 5 additions and 7 deletions

View file

@ -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;

View file

@ -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