summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Triplett <josh@freedesktop.org>2006-04-16 11:23:52 -0700
committerJosh Triplett <josh@freedesktop.org>2006-04-16 11:23:52 -0700
commit999cf2a810192f5134fa650c75f442abc5ac8d48 (patch)
tree392c4e8d92f91f468803933d2d4ba98b7e7421ea
parentc190bd298070584c374dc2a8b1763cf991d07e9f (diff)
parent16e4c9bc2e2d1280fbdc1191a1f450dcd54c9417 (diff)
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xcb
-rw-r--r--src/extensions/glx.xml9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/extensions/glx.xml b/src/extensions/glx.xml
index 32adaac..a40ecb2 100644
--- a/src/extensions/glx.xml
+++ b/src/extensions/glx.xml
@@ -238,9 +238,10 @@ The patch that fixed this server bug in X.org CVS is here:
<field type="CARD32" name="screen" />
<field type="VISUALID" name="visual" />
<field type="xcb_types:PIXMAP" name="pixmap" />
- <field type="glx:PIXMAP" name="glxpixmap" />
+ <field type="glx:PIXMAP" name="glx_pixmap" />
</request>
+
<request name="GetVisualConfigs" opcode="14">
<field type="CARD32" name="screen" />
<reply>
@@ -255,7 +256,7 @@ The patch that fixed this server bug in X.org CVS is here:
</request>
<request name="DestroyGLXPixmap" opcode="15">
- <field type="glx:PIXMAP" name="glxpixmap" />
+ <field type="glx:PIXMAP" name="glx_pixmap" />
</request>
<!--
@@ -335,12 +336,12 @@ The patch that fixed this server bug in X.org CVS is here:
<field type="CARD32" name="screen" />
<field type="CARD32" name="fbconfig" />
<field type="xcb_types:PIXMAP" name="pixmap" />
- <field type="glx:PIXMAP" name="glxpixmap" />
+ <field type="glx:PIXMAP" name="glx_pixmap" />
<field type="CARD32" name="num_attribs" />
</request>
<request name="DestroyPixmap" opcode="23">
- <field type="glx:PIXMAP" name="glxpixmap" />
+ <field type="glx:PIXMAP" name="glx_pixmap" />
</request>
<request name="CreateNewContext" opcode="24">