<div dir="ltr">Reviewed-by: Jasper St. Pierre <<a href="mailto:jstpierre@mecheye.net">jstpierre@mecheye.net</a>></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Fri, Dec 13, 2013 at 12:05 PM, Adam Jackson <span dir="ltr"><<a href="mailto:ajax@redhat.com" target="_blank">ajax@redhat.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">We want to advertise the version we implement, not the version the<br>
protocol headers happen to describe.<br>
<br>
Signed-off-by: Adam Jackson <<a href="mailto:ajax@redhat.com">ajax@redhat.com</a>><br>
---<br>
dri3/dri3_request.c | 5 +++--<br>
include/protocol-versions.h | 4 ++++<br>
2 files changed, 7 insertions(+), 2 deletions(-)<br>
<br>
diff --git a/dri3/dri3_request.c b/dri3/dri3_request.c<br>
index 3ebb9d5..4e1408f 100644<br>
--- a/dri3/dri3_request.c<br>
+++ b/dri3/dri3_request.c<br>
@@ -29,6 +29,7 @@<br>
#include <unistd.h><br>
#include <xace.h><br>
#include "../Xext/syncsdk.h"<br>
+#include <protocol-versions.h><br>
<br>
static int<br>
proc_dri3_query_version(ClientPtr client)<br>
@@ -38,8 +39,8 @@ proc_dri3_query_version(ClientPtr client)<br>
.type = X_Reply,<br>
.sequenceNumber = client->sequence,<br>
.length = 0,<br>
- .majorVersion = DRI3_MAJOR,<br>
- .minorVersion = DRI3_MINOR<br>
+ .majorVersion = SERVER_DRI3_MAJOR_VERSION,<br>
+ .minorVersion = SERVER_DRI3_MINOR_VERSION<br>
};<br>
<br>
REQUEST_SIZE_MATCH(xDRI3QueryVersionReq);<br>
diff --git a/include/protocol-versions.h b/include/protocol-versions.h<br>
index 95df8ce..7fe61e0 100644<br>
--- a/include/protocol-versions.h<br>
+++ b/include/protocol-versions.h<br>
@@ -46,6 +46,10 @@<br>
#define SERVER_DAMAGE_MAJOR_VERSION 1<br>
#define SERVER_DAMAGE_MINOR_VERSION 1<br>
<br>
+/* DRI3 */<br>
+#define SERVER_DRI3_MAJOR_VERSION 1<br>
+#define SERVER_DRI3_MINOR_VERSION 0<br>
+<br>
/* DMX */<br>
#define SERVER_DMX_MAJOR_VERSION 2<br>
#define SERVER_DMX_MINOR_VERSION 2<br>
<span class="HOEnZb"><font color="#888888">--<br>
1.8.4.2<br>
<br>
_______________________________________________<br>
<a href="mailto:xorg-devel@lists.x.org">xorg-devel@lists.x.org</a>: X.Org development<br>
Archives: <a href="http://lists.x.org/archives/xorg-devel" target="_blank">http://lists.x.org/archives/xorg-devel</a><br>
Info: <a href="http://lists.x.org/mailman/listinfo/xorg-devel" target="_blank">http://lists.x.org/mailman/listinfo/xorg-devel</a><br>
</font></span></blockquote></div><br><br clear="all"><br>-- <br> Jasper<br>
</div>