Merge branch '7.8'
This commit is contained in:
commit
1318848f78
|
@ -19,8 +19,8 @@ drivers. Newbie questions are OK, but please try the general OpenGL
|
||||||
resources and Mesa/DRI documentation first.
|
resources and Mesa/DRI documentation first.
|
||||||
</li>
|
</li>
|
||||||
<br>
|
<br>
|
||||||
<li><a href="https://lists.sourceforge.net/lists/listinfo/mesa3d-dev"
|
<li><a href="http://lists.freedesktop.org/mailman/listinfo/mesa-dev"
|
||||||
target="_parent">mesa3d-dev</a> - for Mesa, Gallium and DRI development
|
target="_parent">mesa-dev</a> - for Mesa, Gallium and DRI development
|
||||||
discussion. Not for beginners.
|
discussion. Not for beginners.
|
||||||
</li>
|
</li>
|
||||||
<br>
|
<br>
|
||||||
|
|
|
@ -243,7 +243,7 @@ uint i915_emit_texld( struct i915_fp_compile *p,
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
assert(GET_UREG_TYPE(dest) != REG_TYPE_CONST);
|
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? */
|
/* is the sampler coord a texcoord input reg? */
|
||||||
if (GET_UREG_TYPE(coord) != REG_TYPE_T) {
|
if (GET_UREG_TYPE(coord) != REG_TYPE_T) {
|
||||||
|
|
|
@ -101,8 +101,7 @@ DRI2WireToEvent(Display *dpy, XEvent *event, xEvent *wire)
|
||||||
GLXBufferSwapComplete *aevent = (GLXBufferSwapComplete *)event;
|
GLXBufferSwapComplete *aevent = (GLXBufferSwapComplete *)event;
|
||||||
xDRI2BufferSwapComplete *awire = (xDRI2BufferSwapComplete *)wire;
|
xDRI2BufferSwapComplete *awire = (xDRI2BufferSwapComplete *)wire;
|
||||||
aevent->serial = _XSetLastRequestRead(dpy, (xGenericReply *) wire);
|
aevent->serial = _XSetLastRequestRead(dpy, (xGenericReply *) wire);
|
||||||
aevent->type =
|
aevent->type = glx_info->codes->first_event + GLX_BufferSwapComplete;
|
||||||
(glx_info->codes->first_event + GLX_BufferSwapComplete) & 0x75;
|
|
||||||
aevent->send_event = (awire->type & 0x80) != 0;
|
aevent->send_event = (awire->type & 0x80) != 0;
|
||||||
aevent->display = dpy;
|
aevent->display = dpy;
|
||||||
aevent->drawable = awire->drawable;
|
aevent->drawable = awire->drawable;
|
||||||
|
|
Loading…
Reference in New Issue