From 4a796264dfc1bdba37a7204f3439a8da213109ed Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Sun, 11 Apr 2010 17:56:21 -0700 Subject: i915g: Fix assert. --- src/gallium/drivers/i915/i915_fpc_emit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/gallium/drivers/i915/i915_fpc_emit.c b/src/gallium/drivers/i915/i915_fpc_emit.c index b054ce41d3..76c24d2b2f 100644 --- a/src/gallium/drivers/i915/i915_fpc_emit.c +++ b/src/gallium/drivers/i915/i915_fpc_emit.c @@ -243,7 +243,7 @@ uint i915_emit_texld( struct i915_fp_compile *p, } else { assert(GET_UREG_TYPE(dest) != REG_TYPE_CONST); - assert(dest = UREG(GET_UREG_TYPE(dest), GET_UREG_NR(dest))); + assert(dest == UREG(GET_UREG_TYPE(dest), GET_UREG_NR(dest))); /* is the sampler coord a texcoord input reg? */ if (GET_UREG_TYPE(coord) != REG_TYPE_T) { -- cgit v1.2.3 From 157bdd1446dd21cc87a89abdc890b2f6dc83af76 Mon Sep 17 00:00:00 2001 From: Jesse Barnes Date: Tue, 13 Apr 2010 09:38:41 -0700 Subject: DRI2: report swap events correctly in direct rendered case In the direct rendered case, we need to convert DRI2 swap complete events to GLX events for the client to consume. This path had what looks like a stray "& 0x75" from some earlier debugging that prevented clients from seeing the right event code. --- src/glx/dri2.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src') diff --git a/src/glx/dri2.c b/src/glx/dri2.c index 80c125e741..6afa414965 100644 --- a/src/glx/dri2.c +++ b/src/glx/dri2.c @@ -101,8 +101,7 @@ DRI2WireToEvent(Display *dpy, XEvent *event, xEvent *wire) GLXBufferSwapComplete *aevent = (GLXBufferSwapComplete *)event; xDRI2BufferSwapComplete *awire = (xDRI2BufferSwapComplete *)wire; aevent->serial = _XSetLastRequestRead(dpy, (xGenericReply *) wire); - aevent->type = - (glx_info->codes->first_event + GLX_BufferSwapComplete) & 0x75; + aevent->type = glx_info->codes->first_event + GLX_BufferSwapComplete; aevent->send_event = (awire->type & 0x80) != 0; aevent->display = dpy; aevent->drawable = awire->drawable; -- cgit v1.2.3