X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=specs%2Fd3d11shader.py;h=16bb5e4437e6753bce634a79f2b9b396a695c1c1;hb=d06fb348d5daabcb99f06f7b743f9b958c28bcf2;hp=a1c024708160b20e38d2bbdc6f5b99e1ab0b624b;hpb=5b6fb75c9e2f1ad31bc3c3fb354003efe0352050;p=apitrace

diff --git a/specs/d3d11shader.py b/specs/d3d11shader.py
index a1c0247..16bb5e4 100644
--- a/specs/d3d11shader.py
+++ b/specs/d3d11shader.py
@@ -27,160 +27,160 @@
 from d3dcommon import *
 
 
-ID3D11ShaderReflectionType = Interface('ID3D11ShaderReflectionType', IUnknown)
-ID3D11ShaderReflectionVariable = Interface('ID3D11ShaderReflectionVariable', IUnknown)
-ID3D11ShaderReflectionConstantBuffer = Interface('ID3D11ShaderReflectionConstantBuffer', IUnknown)
-ID3D11ShaderReflection = Interface('ID3D11ShaderReflection', IUnknown)
-
-
-D3D11_SHADER_VERSION_TYPE = Enum('D3D11_SHADER_VERSION_TYPE', [
-    'D3D11_SHVER_PIXEL_SHADER',
-    'D3D11_SHVER_VERTEX_SHADER',
-    'D3D11_SHVER_GEOMETRY_SHADER',
-    'D3D11_SHVER_HULL_SHADER',
-    'D3D11_SHVER_DOMAIN_SHADER',
-    'D3D11_SHVER_COMPUTE_SHADER',
+ID3D11ShaderReflectionType = Interface("ID3D11ShaderReflectionType", IUnknown)
+ID3D11ShaderReflectionVariable = Interface("ID3D11ShaderReflectionVariable", IUnknown)
+ID3D11ShaderReflectionConstantBuffer = Interface("ID3D11ShaderReflectionConstantBuffer", IUnknown)
+ID3D11ShaderReflection = Interface("ID3D11ShaderReflection", IUnknown)
+
+
+D3D11_SHADER_VERSION_TYPE = Enum("D3D11_SHADER_VERSION_TYPE", [
+    "D3D11_SHVER_PIXEL_SHADER",
+    "D3D11_SHVER_VERTEX_SHADER",
+    "D3D11_SHVER_GEOMETRY_SHADER",
+    "D3D11_SHVER_HULL_SHADER",
+    "D3D11_SHVER_DOMAIN_SHADER",
+    "D3D11_SHVER_COMPUTE_SHADER",
 ])
 
-D3D11_SIGNATURE_PARAMETER_DESC = Struct('D3D11_SIGNATURE_PARAMETER_DESC', [
-    (LPCSTR, 'SemanticName'),
-    (UINT, 'SemanticIndex'),
-    (UINT, 'Register'),
-    (D3D_NAME, 'SystemValueType'),
-    (D3D_REGISTER_COMPONENT_TYPE, 'ComponentType'),
-    (BYTE, 'Mask'),
-    (BYTE, 'ReadWriteMask'),
-    (UINT, 'Stream'),
+D3D11_SIGNATURE_PARAMETER_DESC = Struct("D3D11_SIGNATURE_PARAMETER_DESC", [
+    (LPCSTR, "SemanticName"),
+    (UINT, "SemanticIndex"),
+    (UINT, "Register"),
+    (D3D_NAME, "SystemValueType"),
+    (D3D_REGISTER_COMPONENT_TYPE, "ComponentType"),
+    (BYTE, "Mask"),
+    (BYTE, "ReadWriteMask"),
+    (UINT, "Stream"),
 ])
 
-D3D11_SHADER_BUFFER_DESC = Struct('D3D11_SHADER_BUFFER_DESC', [
-    (LPCSTR, 'Name'),
-    (D3D_CBUFFER_TYPE, 'Type'),
-    (UINT, 'Variables'),
-    (UINT, 'Size'),
-    (UINT, 'uFlags'),
+D3D11_SHADER_BUFFER_DESC = Struct("D3D11_SHADER_BUFFER_DESC", [
+    (LPCSTR, "Name"),
+    (D3D_CBUFFER_TYPE, "Type"),
+    (UINT, "Variables"),
+    (UINT, "Size"),
+    (UINT, "uFlags"),
 ])
 
-D3D11_SHADER_VARIABLE_DESC = Struct('D3D11_SHADER_VARIABLE_DESC', [
-    (LPCSTR, 'Name'),
-    (UINT, 'StartOffset'),
-    (UINT, 'Size'),
-    (UINT, 'uFlags'),
-    (LPVOID, 'DefaultValue'),
-    (UINT, 'StartTexture'),
-    (UINT, 'TextureSize'),
-    (UINT, 'StartSampler'),
-    (UINT, 'SamplerSize'),
+D3D11_SHADER_VARIABLE_DESC = Struct("D3D11_SHADER_VARIABLE_DESC", [
+    (LPCSTR, "Name"),
+    (UINT, "StartOffset"),
+    (UINT, "Size"),
+    (UINT, "uFlags"),
+    (LPVOID, "DefaultValue"),
+    (UINT, "StartTexture"),
+    (UINT, "TextureSize"),
+    (UINT, "StartSampler"),
+    (UINT, "SamplerSize"),
 ])
 
-D3D11_SHADER_TYPE_DESC = Struct('D3D11_SHADER_TYPE_DESC', [
-    (D3D_SHADER_VARIABLE_CLASS, 'Class'),
-    (D3D_SHADER_VARIABLE_TYPE, 'Type'),
-    (UINT, 'Rows'),
-    (UINT, 'Columns'),
-    (UINT, 'Elements'),
-    (UINT, 'Members'),
-    (UINT, 'Offset'),
-    (LPCSTR, 'Name'),
+D3D11_SHADER_TYPE_DESC = Struct("D3D11_SHADER_TYPE_DESC", [
+    (D3D_SHADER_VARIABLE_CLASS, "Class"),
+    (D3D_SHADER_VARIABLE_TYPE, "Type"),
+    (UINT, "Rows"),
+    (UINT, "Columns"),
+    (UINT, "Elements"),
+    (UINT, "Members"),
+    (UINT, "Offset"),
+    (LPCSTR, "Name"),
 ])
 
-D3D11_SHADER_DESC = Struct('D3D11_SHADER_DESC', [
-    (UINT, 'Version'),
-    (LPCSTR, 'Creator'),
-    (UINT, 'Flags'),
-    (UINT, 'ConstantBuffers'),
-    (UINT, 'BoundResources'),
-    (UINT, 'InputParameters'),
-    (UINT, 'OutputParameters'),
-    (UINT, 'InstructionCount'),
-    (UINT, 'TempRegisterCount'),
-    (UINT, 'TempArrayCount'),
-    (UINT, 'DefCount'),
-    (UINT, 'DclCount'),
-    (UINT, 'TextureNormalInstructions'),
-    (UINT, 'TextureLoadInstructions'),
-    (UINT, 'TextureCompInstructions'),
-    (UINT, 'TextureBiasInstructions'),
-    (UINT, 'TextureGradientInstructions'),
-    (UINT, 'FloatInstructionCount'),
-    (UINT, 'IntInstructionCount'),
-    (UINT, 'UintInstructionCount'),
-    (UINT, 'StaticFlowControlCount'),
-    (UINT, 'DynamicFlowControlCount'),
-    (UINT, 'MacroInstructionCount'),
-    (UINT, 'ArrayInstructionCount'),
-    (UINT, 'CutInstructionCount'),
-    (UINT, 'EmitInstructionCount'),
-    (D3D_PRIMITIVE_TOPOLOGY, 'GSOutputTopology'),
-    (UINT, 'GSMaxOutputVertexCount'),
-    (D3D_PRIMITIVE, 'InputPrimitive'),
-    (UINT, 'PatchConstantParameters'),
-    (UINT, 'cGSInstanceCount'),
-    (UINT, 'cControlPoints'),
-    (D3D_TESSELLATOR_OUTPUT_PRIMITIVE, 'HSOutputPrimitive'),
-    (D3D_TESSELLATOR_PARTITIONING, 'HSPartitioning'),
-    (D3D_TESSELLATOR_DOMAIN, 'TessellatorDomain'),
-    (UINT, 'cBarrierInstructions'),
-    (UINT, 'cInterlockedInstructions'),
-    (UINT, 'cTextureStoreInstructions'),
+D3D11_SHADER_DESC = Struct("D3D11_SHADER_DESC", [
+    (UINT, "Version"),
+    (LPCSTR, "Creator"),
+    (UINT, "Flags"),
+    (UINT, "ConstantBuffers"),
+    (UINT, "BoundResources"),
+    (UINT, "InputParameters"),
+    (UINT, "OutputParameters"),
+    (UINT, "InstructionCount"),
+    (UINT, "TempRegisterCount"),
+    (UINT, "TempArrayCount"),
+    (UINT, "DefCount"),
+    (UINT, "DclCount"),
+    (UINT, "TextureNormalInstructions"),
+    (UINT, "TextureLoadInstructions"),
+    (UINT, "TextureCompInstructions"),
+    (UINT, "TextureBiasInstructions"),
+    (UINT, "TextureGradientInstructions"),
+    (UINT, "FloatInstructionCount"),
+    (UINT, "IntInstructionCount"),
+    (UINT, "UintInstructionCount"),
+    (UINT, "StaticFlowControlCount"),
+    (UINT, "DynamicFlowControlCount"),
+    (UINT, "MacroInstructionCount"),
+    (UINT, "ArrayInstructionCount"),
+    (UINT, "CutInstructionCount"),
+    (UINT, "EmitInstructionCount"),
+    (D3D_PRIMITIVE_TOPOLOGY, "GSOutputTopology"),
+    (UINT, "GSMaxOutputVertexCount"),
+    (D3D_PRIMITIVE, "InputPrimitive"),
+    (UINT, "PatchConstantParameters"),
+    (UINT, "cGSInstanceCount"),
+    (UINT, "cControlPoints"),
+    (D3D_TESSELLATOR_OUTPUT_PRIMITIVE, "HSOutputPrimitive"),
+    (D3D_TESSELLATOR_PARTITIONING, "HSPartitioning"),
+    (D3D_TESSELLATOR_DOMAIN, "TessellatorDomain"),
+    (UINT, "cBarrierInstructions"),
+    (UINT, "cInterlockedInstructions"),
+    (UINT, "cTextureStoreInstructions"),
 ])
 
-D3D11_SHADER_INPUT_BIND_DESC = Struct('D3D11_SHADER_INPUT_BIND_DESC', [
-    (LPCSTR, 'Name'),
-    (D3D_SHADER_INPUT_TYPE, 'Type'),
-    (UINT, 'BindPoint'),
-    (UINT, 'BindCount'),
-    (UINT, 'uFlags'),
-    (D3D_RESOURCE_RETURN_TYPE, 'ReturnType'),
-    (D3D_SRV_DIMENSION, 'Dimension'),
-    (UINT, 'NumSamples'),
+D3D11_SHADER_INPUT_BIND_DESC = Struct("D3D11_SHADER_INPUT_BIND_DESC", [
+    (LPCSTR, "Name"),
+    (D3D_SHADER_INPUT_TYPE, "Type"),
+    (UINT, "BindPoint"),
+    (UINT, "BindCount"),
+    (UINT, "uFlags"),
+    (D3D_RESOURCE_RETURN_TYPE, "ReturnType"),
+    (D3D_SRV_DIMENSION, "Dimension"),
+    (UINT, "NumSamples"),
 ])
 
 ID3D11ShaderReflectionType.methods += [
-    StdMethod(HRESULT, 'GetDesc', [Out(Pointer(D3D11_SHADER_TYPE_DESC), 'pDesc')]),
-    StdMethod(Pointer(ID3D11ShaderReflectionType), 'GetMemberTypeByIndex', [(UINT, 'Index')]),
-    StdMethod(Pointer(ID3D11ShaderReflectionType), 'GetMemberTypeByName', [(LPCSTR, 'Name')]),
-    StdMethod(LPCSTR, 'GetMemberTypeName', [(UINT, 'Index')]),
-    StdMethod(HRESULT, 'IsEqual', [(Pointer(ID3D11ShaderReflectionType), 'pType')]),
-    StdMethod(Pointer(ID3D11ShaderReflectionType), 'GetSubType', []),
-    StdMethod(Pointer(ID3D11ShaderReflectionType), 'GetBaseClass', []),
-    StdMethod(UINT, 'GetNumInterfaces', []),
-    StdMethod(Pointer(ID3D11ShaderReflectionType), 'GetInterfaceByIndex', [(UINT, 'uIndex')]),
-    StdMethod(HRESULT, 'IsOfType', [(Pointer(ID3D11ShaderReflectionType), 'pType')]),
-    StdMethod(HRESULT, 'ImplementsInterface', [(Pointer(ID3D11ShaderReflectionType), 'pBase')]),
+    StdMethod(HRESULT, "GetDesc", [Out(Pointer(D3D11_SHADER_TYPE_DESC), "pDesc")], sideeffects=False),
+    StdMethod(ObjPointer(ID3D11ShaderReflectionType), "GetMemberTypeByIndex", [(UINT, "Index")]),
+    StdMethod(ObjPointer(ID3D11ShaderReflectionType), "GetMemberTypeByName", [(LPCSTR, "Name")]),
+    StdMethod(LPCSTR, "GetMemberTypeName", [(UINT, "Index")], sideeffects=False),
+    StdMethod(HRESULT, "IsEqual", [(ObjPointer(ID3D11ShaderReflectionType), "pType")], sideeffects=False),
+    StdMethod(ObjPointer(ID3D11ShaderReflectionType), "GetSubType", []),
+    StdMethod(ObjPointer(ID3D11ShaderReflectionType), "GetBaseClass", []),
+    StdMethod(UINT, "GetNumInterfaces", [], sideeffects=False),
+    StdMethod(ObjPointer(ID3D11ShaderReflectionType), "GetInterfaceByIndex", [(UINT, "uIndex")]),
+    StdMethod(HRESULT, "IsOfType", [(ObjPointer(ID3D11ShaderReflectionType), "pType")], sideeffects=False),
+    StdMethod(HRESULT, "ImplementsInterface", [(ObjPointer(ID3D11ShaderReflectionType), "pBase")], sideeffects=False),
 ]
 
 ID3D11ShaderReflectionVariable.methods += [
-    StdMethod(HRESULT, 'GetDesc', [Out(Pointer(D3D11_SHADER_VARIABLE_DESC), 'pDesc')]),
-    StdMethod(Pointer(ID3D11ShaderReflectionType), 'GetType', []),
-    StdMethod(Pointer(ID3D11ShaderReflectionConstantBuffer), 'GetBuffer', []),
-    StdMethod(UINT, 'GetInterfaceSlot', [(UINT, 'uArrayIndex')]),
+    StdMethod(HRESULT, "GetDesc", [Out(Pointer(D3D11_SHADER_VARIABLE_DESC), "pDesc")], sideeffects=False),
+    StdMethod(ObjPointer(ID3D11ShaderReflectionType), "GetType", []),
+    StdMethod(ObjPointer(ID3D11ShaderReflectionConstantBuffer), "GetBuffer", []),
+    StdMethod(UINT, "GetInterfaceSlot", [(UINT, "uArrayIndex")], sideeffects=False),
 ]
 
 ID3D11ShaderReflectionConstantBuffer.methods += [
-    StdMethod(HRESULT, 'GetDesc', [(Pointer(D3D11_SHADER_BUFFER_DESC), 'pDesc')]),
-    StdMethod(Pointer(ID3D11ShaderReflectionVariable), 'GetVariableByIndex', [(UINT, 'Index')]),
-    StdMethod(Pointer(ID3D11ShaderReflectionVariable), 'GetVariableByName', [(LPCSTR, 'Name')]),
+    StdMethod(HRESULT, "GetDesc", [Out(Pointer(D3D11_SHADER_BUFFER_DESC), "pDesc")], sideeffects=False),
+    StdMethod(ObjPointer(ID3D11ShaderReflectionVariable), "GetVariableByIndex", [(UINT, "Index")]),
+    StdMethod(ObjPointer(ID3D11ShaderReflectionVariable), "GetVariableByName", [(LPCSTR, "Name")]),
 ]
 
 ID3D11ShaderReflection.methods += [
-    StdMethod(HRESULT, 'GetDesc', [Out(Pointer(D3D11_SHADER_DESC), 'pDesc')]),
-    StdMethod(Pointer(ID3D11ShaderReflectionConstantBuffer), 'GetConstantBufferByIndex', [(UINT, 'Index')]),
-    StdMethod(Pointer(ID3D11ShaderReflectionConstantBuffer), 'GetConstantBufferByName', [(LPCSTR, 'Name')]),
-    StdMethod(HRESULT, 'GetResourceBindingDesc', [(UINT, 'ResourceIndex'), Out(Pointer(D3D11_SHADER_INPUT_BIND_DESC), 'pDesc')]),
-    StdMethod(HRESULT, 'GetInputParameterDesc', [(UINT, 'ParameterIndex'), Out(Pointer(D3D11_SIGNATURE_PARAMETER_DESC), 'pDesc')]),
-    StdMethod(HRESULT, 'GetOutputParameterDesc', [(UINT, 'ParameterIndex'), Out(Pointer(D3D11_SIGNATURE_PARAMETER_DESC), 'pDesc')]),
-    StdMethod(HRESULT, 'GetPatchConstantParameterDesc', [(UINT, 'ParameterIndex'), Out(Pointer(D3D11_SIGNATURE_PARAMETER_DESC), 'pDesc')]),
-    StdMethod(Pointer(ID3D11ShaderReflectionVariable), 'GetVariableByName', [(LPCSTR, 'Name')]),
-    StdMethod(HRESULT, 'GetResourceBindingDescByName', [(LPCSTR, 'Name'), Out(Pointer(D3D11_SHADER_INPUT_BIND_DESC), 'pDesc')]),
-    StdMethod(UINT, 'GetMovInstructionCount', []),
-    StdMethod(UINT, 'GetMovcInstructionCount', []),
-    StdMethod(UINT, 'GetConversionInstructionCount', []),
-    StdMethod(UINT, 'GetBitwiseInstructionCount', []),
-    StdMethod(D3D_PRIMITIVE, 'GetGSInputPrimitive', []),
-    StdMethod(BOOL, 'IsSampleFrequencyShader', []),
-    StdMethod(UINT, 'GetNumInterfaceSlots', []),
-    StdMethod(HRESULT, 'GetMinFeatureLevel', [Out(Pointer(D3D_FEATURE_LEVEL), 'pLevel')]),
-    StdMethod(UINT, 'GetThreadGroupSize', [Out(Pointer(UINT), 'pSizeX'), Out(Pointer(UINT), 'pSizeY'), Out(Pointer(UINT), 'pSizeZ')]),
+    StdMethod(HRESULT, "GetDesc", [Out(Pointer(D3D11_SHADER_DESC), "pDesc")]),
+    StdMethod(ObjPointer(ID3D11ShaderReflectionConstantBuffer), "GetConstantBufferByIndex", [(UINT, "Index")]),
+    StdMethod(ObjPointer(ID3D11ShaderReflectionConstantBuffer), "GetConstantBufferByName", [(LPCSTR, "Name")]),
+    StdMethod(HRESULT, "GetResourceBindingDesc", [(UINT, "ResourceIndex"), Out(Pointer(D3D11_SHADER_INPUT_BIND_DESC), "pDesc")]),
+    StdMethod(HRESULT, "GetInputParameterDesc", [(UINT, "ParameterIndex"), Out(Pointer(D3D11_SIGNATURE_PARAMETER_DESC), "pDesc")]),
+    StdMethod(HRESULT, "GetOutputParameterDesc", [(UINT, "ParameterIndex"), Out(Pointer(D3D11_SIGNATURE_PARAMETER_DESC), "pDesc")]),
+    StdMethod(HRESULT, "GetPatchConstantParameterDesc", [(UINT, "ParameterIndex"), Out(Pointer(D3D11_SIGNATURE_PARAMETER_DESC), "pDesc")]),
+    StdMethod(ObjPointer(ID3D11ShaderReflectionVariable), "GetVariableByName", [(LPCSTR, "Name")]),
+    StdMethod(HRESULT, "GetResourceBindingDescByName", [(LPCSTR, "Name"), Out(Pointer(D3D11_SHADER_INPUT_BIND_DESC), "pDesc")]),
+    StdMethod(UINT, "GetMovInstructionCount", [], sideeffects=False),
+    StdMethod(UINT, "GetMovcInstructionCount", [], sideeffects=False),
+    StdMethod(UINT, "GetConversionInstructionCount", [], sideeffects=False),
+    StdMethod(UINT, "GetBitwiseInstructionCount", [], sideeffects=False),
+    StdMethod(D3D_PRIMITIVE, "GetGSInputPrimitive", [], sideeffects=False),
+    StdMethod(BOOL, "IsSampleFrequencyShader", [], sideeffects=False),
+    StdMethod(UINT, "GetNumInterfaceSlots", [], sideeffects=False),
+    StdMethod(HRESULT, "GetMinFeatureLevel", [Out(Pointer(D3D_FEATURE_LEVEL), "pLevel")]),
+    StdMethod(UINT, "GetThreadGroupSize", [Out(Pointer(UINT), "pSizeX"), Out(Pointer(UINT), "pSizeY"), Out(Pointer(UINT), "pSizeZ")], sideeffects=False),
 ]