X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=specs%2Fd3d9types.py;h=dc9e85203df21cbd63e9c86b3d4e56bf9d61194a;hb=d5422a4b96d43614507df2bb0c248d04bbe6683a;hp=cc9ac650b60578630f9cf3d6bf6cc45699961fa4;hpb=f541754558ae0c910b3fc59e81b814a3c4a390c8;p=apitrace diff --git a/specs/d3d9types.py b/specs/d3d9types.py index cc9ac65..dc9e852 100644 --- a/specs/d3d9types.py +++ b/specs/d3d9types.py @@ -238,9 +238,6 @@ D3DTRANSFORMSTATETYPE = Enum("D3DTRANSFORMSTATETYPE", [ "D3DTS_TEXTURE5", "D3DTS_TEXTURE6", "D3DTS_TEXTURE7", -]) - -D3DTS = Flags(DWORD, [ "D3DTS_WORLD", "D3DTS_WORLD1", "D3DTS_WORLD2", @@ -296,7 +293,7 @@ D3DDEBUGMONITORTOKENS = Enum("D3DDEBUGMONITORTOKENS", [ # TODO: Convert these to/from actual floats FLOAT_AS_DWORD = DWORD -D3DRENDERSTATEVALUE = Polymorphic(DWORD, "State", [ +D3DRENDERSTATETYPE, D3DRENDERSTATEVALUE = EnumPolymorphic("D3DRENDERSTATETYPE", "State", [ ("D3DRS_ZENABLE", D3DZBUFFERTYPE), ("D3DRS_FILLMODE", D3DFILLMODE), ("D3DRS_SHADEMODE", D3DSHADEMODE), @@ -402,11 +399,7 @@ D3DRENDERSTATEVALUE = Polymorphic(DWORD, "State", [ ("D3DRS_BLENDOPALPHA", D3DBLENDOP), # XXX: D3DRENDERSTATE_WRAPBIAS + n -]) - -D3DRENDERSTATETYPE = Enum("D3DRENDERSTATETYPE", [ - expr for expr, types in D3DRENDERSTATEVALUE.switch_types -]) +], DWORD) D3DTSS_TCI = Flags(DWORD, [ #"D3DTSS_TCI_PASSTHRU", # 0 @@ -467,8 +460,17 @@ D3DTEXTURETRANSFORMFLAGS = Enum("D3DTEXTURETRANSFORMFLAGS", [ "D3DTTFF_PROJECTED", ]) +D3DTEXTUREFILTERTYPE = Enum("D3DTEXTUREFILTERTYPE", [ + "D3DTEXF_NONE", + "D3DTEXF_POINT", + "D3DTEXF_LINEAR", + "D3DTEXF_ANISOTROPIC", + "D3DTEXF_PYRAMIDALQUAD", + "D3DTEXF_GAUSSIANQUAD", + "D3DTEXF_CONVOLUTIONMONO", +]) -D3DTEXTURESTAGESTATEVALUE = Polymorphic(DWORD, "Type", [ +D3DTEXTURESTAGESTATETYPE, D3DTEXTURESTAGESTATEVALUE = EnumPolymorphic("D3DTEXTURESTAGESTATETYPE", "Type", [ ("D3DTSS_COLOROP", D3DTEXTUREOP), ("D3DTSS_COLORARG1", D3DTA), ("D3DTSS_COLORARG2", D3DTA), @@ -479,7 +481,7 @@ D3DTEXTURESTAGESTATEVALUE = Polymorphic(DWORD, "Type", [ ("D3DTSS_BUMPENVMAT01", FLOAT_AS_DWORD), ("D3DTSS_BUMPENVMAT10", FLOAT_AS_DWORD), ("D3DTSS_BUMPENVMAT11", FLOAT_AS_DWORD), - ("D3DTSS_TEXCOORDINDEX", D3DTSS_TCI,), + ("D3DTSS_TEXCOORDINDEX", D3DTSS_TCI), ("D3DTSS_BUMPENVLSCALE", FLOAT_AS_DWORD), ("D3DTSS_BUMPENVLOFFSET", FLOAT_AS_DWORD), ("D3DTSS_TEXTURETRANSFORMFLAGS", D3DTEXTURETRANSFORMFLAGS), @@ -487,23 +489,9 @@ D3DTEXTURESTAGESTATEVALUE = Polymorphic(DWORD, "Type", [ ("D3DTSS_ALPHAARG0", D3DTA,), ("D3DTSS_RESULTARG", D3DTA,), ("D3DTSS_CONSTANT", D3DCOLOR), -]) - -D3DTEXTURESTAGESTATETYPE = Enum("D3DTEXTURESTAGESTATETYPE", [ - expr for expr, types in D3DTEXTURESTAGESTATEVALUE.switch_types -]) +], DWORD) -D3DTEXTUREFILTERTYPE = Enum("D3DTEXTUREFILTERTYPE", [ - "D3DTEXF_NONE", - "D3DTEXF_POINT", - "D3DTEXF_LINEAR", - "D3DTEXF_ANISOTROPIC", - "D3DTEXF_PYRAMIDALQUAD", - "D3DTEXF_GAUSSIANQUAD", - "D3DTEXF_CONVOLUTIONMONO", -]) - -D3DSAMPLERSTATEVALUE = Polymorphic(DWORD, "Type", [ +D3DSAMPLERSTATETYPE, D3DSAMPLERSTATEVALUE = EnumPolymorphic("D3DSAMPLERSTATETYPE", "Type", [ ("D3DSAMP_ADDRESSU", D3DTEXTUREADDRESS), ("D3DSAMP_ADDRESSV", D3DTEXTUREADDRESS), ("D3DSAMP_ADDRESSW", D3DTEXTUREADDRESS), @@ -517,11 +505,7 @@ D3DSAMPLERSTATEVALUE = Polymorphic(DWORD, "Type", [ ("D3DSAMP_SRGBTEXTURE", BOOL), ("D3DSAMP_ELEMENTINDEX", DWORD), ("D3DSAMP_DMAPOFFSET", DWORD), -]) - -D3DSAMPLERSTATETYPE = Enum("D3DSAMPLERSTATETYPE", [ - expr for expr, types in D3DSAMPLERSTATEVALUE.switch_types -]) +], DWORD) D3DPV = Flags(DWORD, [ "D3DPV_DONOTCOPYDATA", @@ -629,11 +613,6 @@ D3DVERTEXELEMENT9 = Struct("D3DVERTEXELEMENT9", [ (BYTE, "UsageIndex"), ]) -D3DSHADER_ADDRESSMODE_TYPE = Enum("D3DSHADER_ADDRESSMODE_TYPE", [ - "D3DSHADER_ADDRMODE_ABSOLUTE", - "D3DSHADER_ADDRMODE_RELATIVE", -]) - D3DBASISTYPE = Enum("D3DBASISTYPE", [ "D3DBASIS_BEZIER", "D3DBASIS_BSPLINE", @@ -737,17 +716,19 @@ D3DFORMAT = Enum("D3DFORMAT", [ "D3DFMT_A32B32G32R32F", "D3DFMT_CxV8U8", "D3DFMT_A1", + "D3DFMT_A2B10G10R10_XR_BIAS", "D3DFMT_BINARYBUFFER", # Unofficial formats - "D3DFMT_ATI1", - "D3DFMT_ATI2", + "D3DFMT_ATI1N", + "D3DFMT_ATI2N", "D3DFMT_AYUV", "D3DFMT_DF16", "D3DFMT_DF24", "D3DFMT_INTZ", "D3DFMT_NULL", "D3DFMT_NV12", + "D3DFMT_YV12", "D3DFMT_RAWZ", ]) @@ -758,11 +739,28 @@ D3DDISPLAYMODE = Struct("D3DDISPLAYMODE", [ (D3DFORMAT, "Format"), ]) +D3DCREATE = Flags(DWORD, [ + "D3DCREATE_FPU_PRESERVE", + "D3DCREATE_MULTITHREADED", + "D3DCREATE_PUREDEVICE", + "D3DCREATE_SOFTWARE_VERTEXPROCESSING", + "D3DCREATE_HARDWARE_VERTEXPROCESSING", + "D3DCREATE_MIXED_VERTEXPROCESSING", + "D3DCREATE_DISABLE_DRIVER_MANAGEMENT", + "D3DCREATE_ADAPTERGROUP_DEVICE", + "D3DCREATE_DISABLE_DRIVER_MANAGEMENT_EX", + "D3DCREATE_NOWINDOWCHANGES", + "D3DCREATE_DISABLE_PSGP_THREADING", + "D3DCREATE_ENABLE_PRESENTSTATS", + "D3DCREATE_DISABLE_PRINTSCREEN", + "D3DCREATE_SCREENSAVER", +]) + D3DDEVICE_CREATION_PARAMETERS = Struct("D3DDEVICE_CREATION_PARAMETERS", [ (UINT, "AdapterOrdinal"), (D3DDEVTYPE, "DeviceType"), (HWND, "hFocusWindow"), - (DWORD, "BehaviorFlags"), + (D3DCREATE, "BehaviorFlags"), ]) D3DSWAPEFFECT = Enum("D3DSWAPEFFECT", [ @@ -782,6 +780,24 @@ D3DPRESENT = FakeEnum(DWORD, [ "D3DPRESENT_RATE_DEFAULT", ]) +D3DPRESENTFLAG = Flags(DWORD, [ + "D3DPRESENTFLAG_LOCKABLE_BACKBUFFER", + "D3DPRESENTFLAG_DISCARD_DEPTHSTENCIL", + "D3DPRESENTFLAG_DEVICECLIP", + "D3DPRESENTFLAG_VIDEO", + "D3DPRESENTFLAG_NOAUTOROTATE", + "D3DPRESENTFLAG_UNPRUNEDMODE", +]) + +D3DPRESENT_INTERVAL = Flags(DWORD, [ + "D3DPRESENT_INTERVAL_DEFAULT", # 0 + "D3DPRESENT_INTERVAL_ONE", + "D3DPRESENT_INTERVAL_TWO", + "D3DPRESENT_INTERVAL_THREE", + "D3DPRESENT_INTERVAL_FOUR", + "D3DPRESENT_INTERVAL_IMMEDIATE", +]) + D3DPRESENT_PARAMETERS = Struct("D3DPRESENT_PARAMETERS", [ (UINT, "BackBufferWidth"), (UINT, "BackBufferHeight"), @@ -794,18 +810,9 @@ D3DPRESENT_PARAMETERS = Struct("D3DPRESENT_PARAMETERS", [ (BOOL, "Windowed"), (BOOL, "EnableAutoDepthStencil"), (D3DFORMAT, "AutoDepthStencilFormat"), - (DWORD, "Flags"), + (D3DPRESENTFLAG, "Flags"), (UINT, "FullScreen_RefreshRateInHz"), - (UINT, "PresentationInterval"), -]) - -D3DPRESENTFLAG = Flags(DWORD, [ - "D3DPRESENTFLAG_LOCKABLE_BACKBUFFER", - "D3DPRESENTFLAG_DISCARD_DEPTHSTENCIL", - "D3DPRESENTFLAG_DEVICECLIP", - "D3DPRESENTFLAG_VIDEO", - "D3DPRESENTFLAG_NOAUTOROTATE", - "D3DPRESENTFLAG_UNPRUNEDMODE", + (D3DPRESENT_INTERVAL, "PresentationInterval"), ]) D3DGAMMARAMP = Struct("D3DGAMMARAMP", [ @@ -833,9 +840,17 @@ D3DRESOURCETYPE = Enum("D3DRESOURCETYPE", [ D3DUSAGE = Flags(DWORD, [ "D3DUSAGE_RENDERTARGET", "D3DUSAGE_DEPTHSTENCIL", + "D3DUSAGE_WRITEONLY", + "D3DUSAGE_SOFTWAREPROCESSING", + "D3DUSAGE_DONOTCLIP", + "D3DUSAGE_POINTS", + "D3DUSAGE_RTPATCHES", + "D3DUSAGE_NPATCHES", "D3DUSAGE_DYNAMIC", - "D3DUSAGE_NONSECURE", "D3DUSAGE_AUTOGENMIPMAP", + "D3DUSAGE_RESTRICTED_CONTENT", + "D3DUSAGE_RESTRICT_SHARED_RESOURCE", + "D3DUSAGE_RESTRICT_SHARED_RESOURCE_DRIVER", "D3DUSAGE_DMAP", "D3DUSAGE_QUERY_LEGACYBUMPMAP", "D3DUSAGE_QUERY_SRGBREAD", @@ -844,12 +859,7 @@ D3DUSAGE = Flags(DWORD, [ "D3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING", "D3DUSAGE_QUERY_VERTEXTEXTURE", "D3DUSAGE_QUERY_WRAPANDMIP", - "D3DUSAGE_WRITEONLY", - "D3DUSAGE_SOFTWAREPROCESSING", - "D3DUSAGE_DONOTCLIP", - "D3DUSAGE_POINTS", - "D3DUSAGE_RTPATCHES", - "D3DUSAGE_NPATCHES", + "D3DUSAGE_NONSECURE", "D3DUSAGE_TEXTAPI", ]) @@ -874,7 +884,7 @@ D3DLOCK = Flags(DWORD, [ D3DVERTEXBUFFER_DESC = Struct("D3DVERTEXBUFFER_DESC", [ (D3DFORMAT, "Format"), (D3DRESOURCETYPE, "Type"), - (DWORD, "Usage"), + (D3DUSAGE, "Usage"), (D3DPOOL, "Pool"), (UINT, "Size"), (DWORD, "FVF"), @@ -883,7 +893,7 @@ D3DVERTEXBUFFER_DESC = Struct("D3DVERTEXBUFFER_DESC", [ D3DINDEXBUFFER_DESC = Struct("D3DINDEXBUFFER_DESC", [ (D3DFORMAT, "Format"), (D3DRESOURCETYPE, "Type"), - (DWORD, "Usage"), + (D3DUSAGE, "Usage"), (D3DPOOL, "Pool"), (UINT, "Size"), ]) @@ -891,7 +901,7 @@ D3DINDEXBUFFER_DESC = Struct("D3DINDEXBUFFER_DESC", [ D3DSURFACE_DESC = Struct("D3DSURFACE_DESC", [ (D3DFORMAT, "Format"), (D3DRESOURCETYPE, "Type"), - (DWORD, "Usage"), + (D3DUSAGE, "Usage"), (D3DPOOL, "Pool"), (D3DMULTISAMPLE_TYPE, "MultiSampleType"), (DWORD, "MultiSampleQuality"), @@ -902,7 +912,7 @@ D3DSURFACE_DESC = Struct("D3DSURFACE_DESC", [ D3DVOLUME_DESC = Struct("D3DVOLUME_DESC", [ (D3DFORMAT, "Format"), (D3DRESOURCETYPE, "Type"), - (DWORD, "Usage"), + (D3DUSAGE, "Usage"), (D3DPOOL, "Pool"), (UINT, "Width"), (UINT, "Height"), @@ -911,7 +921,7 @@ D3DVOLUME_DESC = Struct("D3DVOLUME_DESC", [ D3DLOCKED_RECT = Struct("D3DLOCKED_RECT", [ (INT, "Pitch"), - (OpaquePointer(Void), "pBits"), + (LinearPointer(Void, "_MappedSize"), "pBits"), ]) D3DBOX = Struct("D3DBOX", [ @@ -926,7 +936,7 @@ D3DBOX = Struct("D3DBOX", [ D3DLOCKED_BOX = Struct("D3DLOCKED_BOX", [ (INT, "RowPitch"), (INT, "SlicePitch"), - (OpaquePointer(Void), "pBits"), + (LinearPointer(Void, "_MappedSize"), "pBits"), ]) D3DRANGE = Struct("D3DRANGE", [