From: Ian Romanick <ian.d.roman...@intel.com>
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.roman...@intel.com>
Cc: Courtney Goeltzenleuchter <court...@lunarg.com>
Cc: Jordan Justen <jljus...@gmail.com>
---
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 38147e9..59e210f 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 d30c963..fbe1370 100644
--- a/src/mesa/drivers/dri/i965/brw_context.h
+++ b/src/mesa/drivers/dri/i965/brw_context.h
@@ -1440,8 +1440,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
--
1.8.1.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
