Make opaque pointers more consistent.

[apitrace] / d3d9types.py

diff --git a/d3d9types.py b/d3d9types.py
index a8ac525b7746caf97ebf1be3a5e9456d8cf712b7..13e21a71ab0ae67806e2c39441f76d3a1b3c6272 100644 (file)
--- a/d3d9types.py
+++ b/d3d9types.py
@@ -1,21 +1,27 @@
-#############################################################################
+##########################################################################
 #
-# Copyright 2008 Jose Fonseca
+# Copyright 2008-2009 VMware, Inc.
+# All Rights Reserved.
 #
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 #
-#############################################################################
+##########################################################################/
 
 """d3d9types.h"""
 
@@ -44,7 +50,7 @@ D3DRECT = Struct("D3DRECT", [
 ])
 
 D3DMATRIX = Struct("D3DMATRIX", [
-    (Float, "m[4][4]"),
+    (Array(Array(Float, "4"), "4"), "m"),
 ])
 
 D3DVIEWPORT9 = Struct("D3DVIEWPORT9", [
@@ -247,7 +253,6 @@ D3DTRANSFORMSTATETYPE = Enum("D3DTRANSFORMSTATETYPE", [
 ])
 
 D3DTS = Flags(DWORD, [
-    "D3DTS_WORLDMATRIX(index)",
     "D3DTS_WORLD",
     "D3DTS_WORLD1",
     "D3DTS_WORLD2",
@@ -725,12 +730,10 @@ D3DSHADER_PARAM_REGISTER_TYPE = Enum("D3DSHADER_PARAM_REGISTER_TYPE", [
     "D3DSPR_TEMP",
     "D3DSPR_INPUT",
     "D3DSPR_CONST",
-    "D3DSPR_ADDR",
-    "D3DSPR_TEXTURE",
+    "D3DSPR_ADDR|D3DSPR_TEXTURE",
     "D3DSPR_RASTOUT",
     "D3DSPR_ATTROUT",
-    "D3DSPR_TEXCRDOUT",
-    "D3DSPR_OUTPUT",
+    "D3DSPR_TEXCRDOUT|D3DSPR_OUTPUT",
     "D3DSPR_CONSTINT",
     "D3DSPR_COLOROUT",
     "D3DSPR_DEPTHOUT",
@@ -1299,8 +1302,8 @@ D3DCOMPOSERECTDESC = Struct("D3DCOMPOSERECTDESC", [
 D3DCOMPOSERECTDESTINATION = Struct("D3DCOMPOSERECTDESTINATION", [
     (USHORT, "SrcRectIndex"),
     (USHORT, "Reserved"),
-    (Short, "x"),
-    (Short, "y"),
+    (Short, "X"),
+    (Short, "Y"),
 ])
 
 D3DPRESENTSTATS = Struct("D3DPRESENTSTATS", [