Mesa (master): intel: Remove a leftover DRI1/DRI2 conditional
Kristian Høgsberg
krh at kemper.freedesktop.org
Wed Jun 2 22:09:28 UTC 2010
Module: Mesa
Branch: master
Commit: 890b3c61e3b81d4c5623e452317e8faccea91de4
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=890b3c61e3b81d4c5623e452317e8faccea91de4
Author: Kristian Høgsberg <krh at bitplanet.net>
Date: Wed Jun 2 08:58:24 2010 -0400
intel: Remove a leftover DRI1/DRI2 conditional
---
src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
index e51a1a0..feaa2e1 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
@@ -519,13 +519,8 @@ brw_update_renderbuffer_surface(struct brw_context *brw,
_mesa_problem(ctx, "Bad renderbuffer format: %d\n", irb->Base.Format);
}
key.tiling = region->tiling;
- if (brw->intel.intelScreen->driScrnPriv->dri2.enabled) {
- key.width = rb->Width;
- key.height = rb->Height;
- } else {
- key.width = region->width;
- key.height = region->height;
- }
+ key.width = rb->Width;
+ key.height = rb->Height;
key.pitch = region->pitch;
key.cpp = region->cpp;
key.draw_x = region->draw_x;
More information about the mesa-commit
mailing list