diff options
| author | Jesse Barnes <[email protected]> | 2010-04-13 09:40:14 -0700 |
|---|---|---|
| committer | Jesse Barnes <[email protected]> | 2010-04-13 09:40:14 -0700 |
| commit | 1318848f782cce716d6376ca13aebf68b728e24c (patch) | |
| tree | c7b8ffee05085d3846b656b0369c346a2f2546ef /src | |
| parent | efc69ca61cf8fe7d2d44d177e7737999b6a114b5 (diff) | |
| parent | 157bdd1446dd21cc87a89abdc890b2f6dc83af76 (diff) | |
Merge branch '7.8'
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/drivers/i915/i915_fpc_emit.c | 2 | ||||
| -rw-r--r-- | src/glx/dri2.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/gallium/drivers/i915/i915_fpc_emit.c b/src/gallium/drivers/i915/i915_fpc_emit.c index b054ce41d39..76c24d2b2fd 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) { diff --git a/src/glx/dri2.c b/src/glx/dri2.c index 80c125e7418..6afa4149651 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; |