X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=specs%2Fd3dcommon.py;h=9486ba873e2f09254610d6555563ea7651b1409c;hb=7a9fb5103e052150232b64cb5d99374cda3f1234;hp=af6c5c95281a6225209e6e7988d7e796bebca5f4;hpb=5b6fb75c9e2f1ad31bc3c3fb354003efe0352050;p=apitrace

diff --git a/specs/d3dcommon.py b/specs/d3dcommon.py
index af6c5c9..9486ba8 100644
--- a/specs/d3dcommon.py
+++ b/specs/d3dcommon.py
@@ -296,16 +296,17 @@ D3D11_SRV_DIMENSION = Enum('D3D11_SRV_DIMENSION', [
     'D3D11_SRV_DIMENSION_BUFFEREX',
 ])
 
-D3D_SHADER_MACRO = Struct('D3D_SHADER_MACRO', [
+D3D10_SHADER_MACRO = Struct('D3D10_SHADER_MACRO', [
     (LPCSTR, 'Name'),
     (LPCSTR, 'Definition'),
 ])
 
 ID3D10Blob = Interface('ID3D10Blob', IUnknown)
 ID3D10Blob.methods += [
-    StdMethod(LPVOID, 'GetBufferPointer', []),
-    StdMethod(SIZE_T, 'GetBufferSize', []),
+    StdMethod(LPVOID, 'GetBufferPointer', [], sideeffects=False),
+    StdMethod(SIZE_T, 'GetBufferSize', [], sideeffects=False),
 ]
+LPD3D10BLOB = ObjPointer(ID3D10Blob)
 
 D3D_INCLUDE_TYPE = Enum('D3D_INCLUDE_TYPE', [
     'D3D_INCLUDE_LOCAL',
@@ -317,6 +318,15 @@ D3D10_INCLUDE_TYPE = Enum('D3D10_INCLUDE_TYPE', [
     'D3D10_INCLUDE_SYSTEM',
 ])
 
+ID3D10Include = Interface("ID3D10Include", IUnknown)
+ID3D10Include.methods += [
+    StdMethod(HRESULT, "Open", [(D3D10_INCLUDE_TYPE, "IncludeType"), (LPCSTR, "pFileName"), (LPCVOID, "pParentData"), Out(Pointer(LPCVOID), "ppData"), Out(Pointer(UINT), "pBytes")]),
+    StdMethod(HRESULT, "Close", [(LPCVOID, "pData")]),
+]
+# It is implemented by applications, not D3D runtime, so treat as opaque for
+# now.
+LPD3D10INCLUDE = OpaquePointer(ID3D10Include)
+
 D3D_SHADER_VARIABLE_CLASS = Enum('D3D_SHADER_VARIABLE_CLASS', [
     'D3D_SVC_SCALAR',
     'D3D_SVC_VECTOR',