From 0dc18e795c47098d94447c2b8deabbf265737559 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Fonseca?= Date: Sat, 1 Dec 2012 10:07:13 +0000 Subject: [PATCH] specs: A few more tweaks to D3D specs. --- specs/d3d11_1.py | 6 +-- specs/d3d8types.py | 6 --- specs/d3dtypes.py | 111 ++++++++++++++++++++++----------------------- 3 files changed, 58 insertions(+), 65 deletions(-) diff --git a/specs/d3d11_1.py b/specs/d3d11_1.py index 32bba17..5681191 100644 --- a/specs/d3d11_1.py +++ b/specs/d3d11_1.py @@ -168,9 +168,9 @@ ID3D11Device1.methods += [ ] ID3DUserDefinedAnnotation.methods += [ - StdMethod(INT, "BeginEvent", [(LPCWSTR, "Name")]), - StdMethod(INT, "EndEvent", []), - StdMethod(Void, "SetMarker", [(LPCWSTR, "Name")]), + StdMethod(INT, "BeginEvent", [(LPCWSTR, "Name")], sideeffects=False), + StdMethod(INT, "EndEvent", [], sideeffects=False), + StdMethod(Void, "SetMarker", [(LPCWSTR, "Name")], sideeffects=False), StdMethod(BOOL, "GetStatus", [], sideeffects=False), ] diff --git a/specs/d3d8types.py b/specs/d3d8types.py index f13b50b..df90f71 100644 --- a/specs/d3d8types.py +++ b/specs/d3d8types.py @@ -250,12 +250,6 @@ D3DMATERIALCOLORSOURCE = Enum("D3DMATERIALCOLORSOURCE", [ "D3DMCS_COLOR2", ]) -D3DWRAP = Flags(DWORD, [ - "D3DWRAP_U", - "D3DWRAP_V", - "D3DWRAP_W", -]) - D3DWRAPCOORD = Flags(DWORD, [ "D3DWRAPCOORD_0", "D3DWRAPCOORD_1", diff --git a/specs/d3dtypes.py b/specs/d3dtypes.py index 62b6056..1137143 100644 --- a/specs/d3dtypes.py +++ b/specs/d3dtypes.py @@ -28,24 +28,22 @@ from winapi import * D3DVALUE = Float -LPD3DVALUE = Pointer(Float) +LPD3DVALUE = Pointer(D3DVALUE) + D3DFIXED = LONG LPD3DVALIDATECALLBACK = Opaque("LPD3DVALIDATECALLBACK") LPD3DENUMTEXTUREFORMATSCALLBACK = Opaque("LPD3DENUMTEXTUREFORMATSCALLBACK") LPD3DENUMPIXELFORMATSCALLBACK = Opaque("LPD3DENUMPIXELFORMATSCALLBACK") -D3DCOLOR = DWORD -LPD3DCOLOR = Pointer(D3DCOLOR) - -D3DMATERIALHANDLE = DWORD -LPD3DMATERIALHANDLE = Pointer(D3DMATERIALHANDLE) - -D3DTEXTUREHANDLE = DWORD -LPD3DTEXTUREHANDLE = Pointer(D3DTEXTUREHANDLE) +D3DCOLOR = Alias("D3DCOLOR", DWORD) -D3DMATRIXHANDLE = DWORD -LPD3DMATRIXHANDLE = Pointer(D3DMATRIXHANDLE) +D3DVECTOR = Struct("D3DVECTOR", [ + (D3DVALUE, "x"), + (D3DVALUE, "y"), + (D3DVALUE, "z"), +]) +LPD3DVECTOR = Pointer(D3DVECTOR) D3DCOLORVALUE = Struct("D3DCOLORVALUE", [ (D3DVALUE, "r"), @@ -63,12 +61,14 @@ D3DRECT = Struct("D3DRECT", [ ]) LPD3DRECT = Pointer(D3DRECT) -D3DVECTOR = Struct("D3DVECTOR", [ - (D3DVALUE, "x"), - (D3DVALUE, "y"), - (D3DVALUE, "z"), -]) -LPD3DVECTOR = Pointer(D3DVECTOR) +D3DMATERIALHANDLE = DWORD +LPD3DMATERIALHANDLE = Pointer(D3DMATERIALHANDLE) + +D3DTEXTUREHANDLE = DWORD +LPD3DTEXTUREHANDLE = Pointer(D3DTEXTUREHANDLE) + +D3DMATRIXHANDLE = DWORD +LPD3DMATRIXHANDLE = Pointer(D3DMATRIXHANDLE) D3DHVERTEX = Struct("D3DHVERTEX", [ (DWORD, "dwFlags"), @@ -528,6 +528,19 @@ D3DLIGHTSTATETYPE = Enum("D3DLIGHTSTATETYPE", [ "D3DLIGHTSTATE_COLORVERTEX", ]) +D3DMATERIALCOLORSOURCE = Enum("D3DMATERIALCOLORSOURCE", [ + "D3DMCS_MATERIAL", + "D3DMCS_COLOR1", + "D3DMCS_COLOR2", +]) + +D3DWRAPCOORD = Flags(DWORD, [ + "D3DWRAPCOORD_0", + "D3DWRAPCOORD_1", + "D3DWRAPCOORD_2", + "D3DWRAPCOORD_3", +]) + D3DRENDERSTATETYPE = Enum("D3DRENDERSTATETYPE", [ "D3DRENDERSTATE_ANTIALIAS", "D3DRENDERSTATE_TEXTUREPERSPECTIVE", @@ -645,21 +658,6 @@ D3DRENDERSTATETYPE = Enum("D3DRENDERSTATETYPE", [ "D3DRENDERSTATE_STIPPLEPATTERN31", ]) -D3DMATERIALCOLORSOURCE = Enum("D3DMATERIALCOLORSOURCE", [ - "D3DMCS_MATERIAL", - "D3DMCS_COLOR1", - "D3DMCS_COLOR2", -]) - -D3DWRAP = Flags(DWORD, [ - "D3DWRAP_U", - "D3DWRAP_V", - "D3DWRAPCOORD_0", - "D3DWRAPCOORD_1", - "D3DWRAPCOORD_2", - "D3DWRAPCOORD_3", -]) - D3DSTATE = Struct("D3DSTATE", [ (D3DTRANSFORMSTATETYPE, "dtstTransformStateType"), (D3DLIGHTSTATETYPE, "dlstLightStateType"), @@ -918,7 +916,6 @@ D3DPV = Flags(DWORD, [ D3DFVF = Flags(DWORD, [ "D3DFVF_RESERVED0", - "D3DFVF_POSITION_MASK", "D3DFVF_XYZ", "D3DFVF_XYZRHW", "D3DFVF_XYZB1", @@ -930,30 +927,32 @@ D3DFVF = Flags(DWORD, [ "D3DFVF_RESERVED1", "D3DFVF_DIFFUSE", "D3DFVF_SPECULAR", - "D3DFVF_TEXCOUNT_MASK", - "D3DFVF_TEXCOUNT_SHIFT", - "D3DFVF_TEX0", - "D3DFVF_TEX1", - "D3DFVF_TEX2", - "D3DFVF_TEX3", - "D3DFVF_TEX4", - "D3DFVF_TEX5", - "D3DFVF_TEX6", - "D3DFVF_TEX7", - "D3DFVF_TEX8", + #"D3DFVF_TEX0", + #"D3DFVF_TEX1", + #"D3DFVF_TEX2", + #"D3DFVF_TEX3", + #"D3DFVF_TEX4", + #"D3DFVF_TEX5", + #"D3DFVF_TEX6", + #"D3DFVF_TEX7", + #"D3DFVF_TEX8", "D3DFVF_RESERVED2", - "D3DFVF_RESERVED1", - "D3DFVF_VERTEX", - "D3DFVF_LVERTEX", - "D3DFVF_TLVERTEX", - "D3DFVF_TEXCOORDSIZE1(0)", - "D3DFVF_TEXCOORDSIZE1(1)", - "D3DFVF_TEXCOORDSIZE2(0)", - "D3DFVF_TEXCOORDSIZE2(1)", - "D3DFVF_TEXCOORDSIZE3(0)", - "D3DFVF_TEXCOORDSIZE3(1)", - "D3DFVF_TEXCOORDSIZE4(0)", - "D3DFVF_TEXCOORDSIZE4(1)", + #"D3DFVF_TEXCOORDSIZE1(0)", + #"D3DFVF_TEXCOORDSIZE2(0)", + #"D3DFVF_TEXCOORDSIZE3(0)", + #"D3DFVF_TEXCOORDSIZE4(0)", + #"D3DFVF_TEXCOORDSIZE1(1)", + #"D3DFVF_TEXCOORDSIZE2(1)", + #"D3DFVF_TEXCOORDSIZE3(1)", + #"D3DFVF_TEXCOORDSIZE4(1)", + #"D3DFVF_TEXCOORDSIZE1(2)", + #"D3DFVF_TEXCOORDSIZE2(2)", + #"D3DFVF_TEXCOORDSIZE3(2)", + #"D3DFVF_TEXCOORDSIZE4(2)", + #"D3DFVF_TEXCOORDSIZE1(3)", + #"D3DFVF_TEXCOORDSIZE2(3)", + #"D3DFVF_TEXCOORDSIZE3(3)", + #"D3DFVF_TEXCOORDSIZE4(3)", ]) D3DDP_PTRSTRIDE = Struct("D3DDP_PTRSTRIDE", [ -- 2.43.0