Merge branch '7.8'

diff --git a/docs/lists.html b/docs/lists.html
index 9c17a9f3540444bae23da800e9489a7750b1c0e4..e758a790a27ae0fda63667a5709433798a4f149e 100644 (file)
--- a/docs/lists.html
+++ b/docs/lists.html
@@ -19,8 +19,8 @@ drivers.  Newbie questions are OK, but please try the general OpenGL
 resources and Mesa/DRI documentation first.
 </li>
 <br>
-<li><a href="https://lists.sourceforge.net/lists/listinfo/mesa3d-dev"
-target="_parent">mesa3d-dev</a> - for Mesa, Gallium and DRI development
+<li><a href="http://lists.freedesktop.org/mailman/listinfo/mesa-dev"
+target="_parent">mesa-dev</a> - for Mesa, Gallium and DRI development
 discussion.  Not for beginners.
 </li>
 <br>

diff --git a/src/gallium/drivers/i915/i915_fpc_emit.c b/src/gallium/drivers/i915/i915_fpc_emit.c
index b054ce41d3971e56eb4a637b0ca415ca382167fb..76c24d2b2fd7d9e254d2d07aafcf478ce2ea3630 100644 (file)
--- 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 80c125e741852ac0aca5b943bf74c0488705ed52..6afa4149651b7ed6945af503e86877b1feea1814 100644 (file)
--- 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;