[Xcb-commit] xcb-proto/src/extensions xv.xml,1.2,1.3

[Jeremy Kolb]

Update of /cvs/xcb/xcb-proto/src/extensions
In directory gabe:/tmp/cvs-serv32585

Modified Files:
	xv.xml 
Log Message:
Fixed a number of padding issues, QueryImageAttributes now returns the proper image struct.  However this one's weird and won't work yet.

Still not sure about XvShm{Put/Get}Image.


Index: xv.xml
===================================================================
RCS file: /cvs/xcb/xcb-proto/src/extensions/xv.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xv.xml	18 Jul 2005 03:10:06 -0000	1.2
+++ xv.xml	19 Nov 2005 19:31:06 -0000	1.3
@@ -65,6 +65,18 @@
         <field type="CARD8" name="depth" />
     </struct>
 
+    <struct name="Image">
+        <field type="CARD32" name="id" />
+        <field type="CARD16" name="width" />
+        <field type="CARD16" name="height" />
+        <field type="CARD32" name="data_size" />
+        <field type="CARD32" name="num_planes" />
+        <field type="int" name="pitches" /> <!-- int* -->
+        <field type="int" name="offsets" /> <!-- int* -->
+        <field type="CARD8" name="data" /> <!-- char* -->
+        <!-- Some XPointer "obdata" -->
+    </struct>
+    
     <!-- I think this goes with the "QueryPortAttributes" request.  But it's not in the docs. --> 
     <struct name="AttributeInfo">
         <field type="CARD32" name="flags" />
@@ -292,7 +304,7 @@
             <pad bytes="1" />
             <field type="CARD32" name="num_attributes" />
             <field type="CARD32" name="text_size" />
-            <!-- TODO: Make sure this is correct. Is there padding? -->
+            <pad bytes="16" />
             <list type="AttributeInfo" name="attributes" />
         </reply>
     </request>
@@ -303,7 +315,6 @@
             <pad bytes="1" />
             <field type="CARD32" name="num_formats" />
             <pad bytes="20" />
-            <!-- TODO: Make sure that this is correct. -->
             <list type="ImageFormatInfo" name="format">
                 <fieldref>num_formats</fieldref>
             </list>
@@ -322,7 +333,9 @@
             <field type="CARD16" name="width" />
             <field type="CARD16" name="height" />
             <pad bytes="12" />
-            <!-- TODO: What comes after this? I know something does. -->
+            <!-- An XvImage struct comes after this.  But it's
+            currently broken. -->
+            <field type="Image" name="image" />
         </reply>
     </request>