summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRoland Scheidegger <sroland@tungstengraphics.com>2007-07-17 20:06:44 +0200
committerRoland Scheidegger <sroland@tungstengraphics.com>2007-07-17 20:06:44 +0200
commitc5a8bc712542d24a035aa8fe58cf3c28c7c6fbd1 (patch)
tree5fff9234740c3c80f47752fa901213241a01a8f6 /src
parent7664105fc2a27ae0862edff66a0a5a33e4111fe1 (diff)
get rid of checks for old ddx
Diffstat (limited to 'src')
-rw-r--r--src/mesa/drivers/dri/i915tex/intel_buffers.c5
-rw-r--r--src/mesa/drivers/dri/i915tex/intel_screen.c2
2 files changed, 3 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i915tex/intel_buffers.c b/src/mesa/drivers/dri/i915tex/intel_buffers.c
index 5ec8ad0835..bcd99106b9 100644
--- a/src/mesa/drivers/dri/i915tex/intel_buffers.c
+++ b/src/mesa/drivers/dri/i915tex/intel_buffers.c
@@ -157,6 +157,7 @@ intelWindowMoved(struct intel_context *intel)
if (!intel->ctx.DrawBuffer) {
/* when would this happen? -BP */
+ assert(0);
intel->numClipRects = 0;
}
@@ -164,7 +165,7 @@ intelWindowMoved(struct intel_context *intel)
driUpdateFramebufferSize(ctx, dPriv);
intel_fb->Base.Initialized = GL_TRUE; /* XXX remove someday */
- if (intel->intelScreen->driScrnPriv->ddxMinor >= 7) {
+ {
drmI830Sarea *sarea = intel->sarea;
drm_clip_rect_t drw_rect = { .x1 = dPriv->x, .x2 = dPriv->x + dPriv->w,
.y1 = dPriv->y, .y2 = dPriv->y + dPriv->h };
@@ -276,8 +277,6 @@ intelWindowMoved(struct intel_context *intel)
intel_fb->color_rb[i]->vbl_pending = intel_fb->vbl_waited;
}
}
- } else {
- intel_fb->vblank_flags &= ~VBLANK_FLAG_SECONDARY;
}
/* Update hardware scissor */
diff --git a/src/mesa/drivers/dri/i915tex/intel_screen.c b/src/mesa/drivers/dri/i915tex/intel_screen.c
index 0b9ba7eda7..5ad0932e2e 100644
--- a/src/mesa/drivers/dri/i915tex/intel_screen.c
+++ b/src/mesa/drivers/dri/i915tex/intel_screen.c
@@ -692,7 +692,7 @@ __driCreateNewScreen_20050727(__DRInativeDisplay * dpy, int scrn,
__GLcontextModes ** driver_modes)
{
__DRIscreenPrivate *psp;
- static const __DRIversion ddx_expected = { 1, 5, 0 };
+ static const __DRIversion ddx_expected = { 1, 7, 0 };
static const __DRIversion dri_expected = { 4, 0, 0 };
static const __DRIversion drm_expected = { 1, 7, 0 };