{ "ID3D11DeviceContext::OMSetRenderTargets", CALL_FLAG_SWAP_RENDERTARGET },
{ "ID3D11DeviceContext::OMSetRenderTargetsAndUnorderedAccessViews", CALL_FLAG_SWAP_RENDERTARGET },
{ "IDXGISwapChain::Present", CALL_FLAG_END_FRAME },
+ { "IDXGISwapChainDWM::Present", CALL_FLAG_END_FRAME },
{ "IDirect3D9::CheckDeviceFormat", CALL_FLAG_NO_SIDE_EFFECTS | CALL_FLAG_VERBOSE },
{ "IDirect3D9::EnumAdapterModes", CALL_FLAG_NO_SIDE_EFFECTS | CALL_FLAG_VERBOSE },
{ "IDirect3D9::GetAdapterModeCount", CALL_FLAG_NO_SIDE_EFFECTS | CALL_FLAG_VERBOSE },
**************************************************************************/
/*
- * Central place for all D3D10 includes, and respective OS dependent headers.
+ * Central place for all D3D10.1 includes, and respective OS dependent headers.
*/
#ifndef _D3D10_1IMPORTS_HPP_
#include "d3derr.hpp"
+#include "dxgiint.h"
+
+#define D3D10_CREATE_DEVICE_PREVENT_ALTERING_LAYER_SETTINGS_FROM_REGISTRY 0x0080
+#define D3D10_CREATE_DEVICE_STRICT_VALIDATION 0x0200
+#define D3D10_CREATE_DEVICE_DEBUGGABLE 0x0400
#endif /* _D3D10_1IMPORTS_HPP_ */
#include "d3derr.hpp"
+#include "dxgiint.h"
+
+#define D3D10_CREATE_DEVICE_PREVENT_ALTERING_LAYER_SETTINGS_FROM_REGISTRY 0x0080
+#define D3D10_CREATE_DEVICE_STRICT_VALIDATION 0x0200
+#define D3D10_CREATE_DEVICE_DEBUGGABLE 0x0400
#endif /* _D3D10IMPORTS_HPP_ */
#include "d3derr.hpp"
+#include "dxgiint.h"
+
#endif /* _D3D11IMPORTS_HPP_ */
--- /dev/null
+/**************************************************************************
+ *
+ * Copyright 2012 VMware, Inc.
+ * All Rights Reserved.
+ *
+ * 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:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * 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.
+ *
+ **************************************************************************/
+
+
+#ifndef _DXGIINT_H_
+#define _DXGIINT_H_
+
+#include <windows.h>
+
+#include "compat.h"
+
+#include <dxgi.h>
+
+
+static const GUID IID_IDXGIFactoryDWM = {0x713F394E,0x92CA,0x47E7,{0xAB,0x81,0x11,0x59,0xC2,0x79,0x1E,0x54}};
+static const GUID IID_IDXGISwapChainDWM = {0x00000000,0x0000,0x0000,{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}}; // XXX
+
+struct IDXGIFactoryDWM;
+struct IDXGISwapChainDWM;
+
+struct IDXGIFactoryDWM: public IUnknown
+{
+ virtual HRESULT STDMETHODCALLTYPE CreateSwapChain(IUnknown *pDevice, DXGI_SWAP_CHAIN_DESC *pDesc, IDXGIOutput *pOutput, IDXGISwapChainDWM **ppSwapChain) = 0;
+};
+
+struct IDXGISwapChainDWM: public IDXGIDeviceSubObject
+{
+ virtual HRESULT STDMETHODCALLTYPE Present (UINT SyncInterval, UINT Flags) = 0;
+ virtual HRESULT STDMETHODCALLTYPE GetBuffer (UINT Buffer, REFIID riid, void **ppSurface) = 0;
+ virtual HRESULT STDMETHODCALLTYPE GetDesc (DXGI_SWAP_CHAIN_DESC *pDesc) = 0;
+ virtual HRESULT STDMETHODCALLTYPE ResizeBuffers (UINT BufferCount, UINT Width, UINT Height, DXGI_FORMAT NewFormat, UINT SwapChainFlags) = 0;
+ virtual HRESULT STDMETHODCALLTYPE ResizeTarget (const DXGI_MODE_DESC *pNewTargetParameters) = 0;
+ virtual HRESULT STDMETHODCALLTYPE GetContainingOutput (IDXGIOutput **ppOutput) = 0;
+ virtual HRESULT STDMETHODCALLTYPE GetFrameStatistics (DXGI_FRAME_STATISTICS *pStats) = 0;
+ virtual HRESULT STDMETHODCALLTYPE GetLastPresentCount (UINT *pLastPresentCount) = 0;
+ virtual HRESULT STDMETHODCALLTYPE SetFullscreenState (BOOL Fullscreen, IDXGIOutput *pTarget) = 0;
+ virtual HRESULT STDMETHODCALLTYPE GetFullscreenState (BOOL *pFullscreen, IDXGIOutput **ppTarget) = 0;
+};
+
+#endif /* _DXGIINT_H_ */
include_directories (SYSTEM ${DirectX_D3D10_1_INCLUDE_DIR})
set (D3D10_MODULES ${D3D10_MODULES} d3d10_1)
endif ()
+ set (D3DSTATE_SOURCES ${D3DSTATE_SOURCES}
+ d3d10state.cpp
+ d3d10state_images.cpp
+ )
endif ()
if (DirectX_D3D11_INCLUDE_DIR)
include_directories (SYSTEM ${DirectX_D3D11_1_INCLUDE_DIR})
set (D3D10_MODULES ${D3D10_MODULES} d3d11_1)
endif ()
- set (D3D11STATE_SOURCES
+ set (D3DSTATE_SOURCES ${D3DSTATE_SOURCES}
d3d11state.cpp
d3d11state_images.cpp
)
d3dretrace_ws.cpp
d3d9state.cpp
d3d9state_images.cpp
- ${D3D11STATE_SOURCES}
+ ${D3DSTATE_SOURCES}
)
target_link_libraries (d3dretrace
retrace_common
--- /dev/null
+/**************************************************************************
+ *
+ * Copyright 2011 Jose Fonseca
+ * All Rights Reserved.
+ *
+ * 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:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * 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.
+ *
+ **************************************************************************/
+
+
+#include <stdio.h>
+
+#include <iostream>
+
+#include "d3d11imports.hpp"
+#include "json.hpp"
+
+
+namespace d3dstate {
+
+
+void
+dumpDevice(std::ostream &os, ID3D10Device *pDevice)
+{
+ JSONWriter json(os);
+
+ /* TODO */
+}
+
+
+} /* namespace d3dstate */
--- /dev/null
+/**************************************************************************
+ *
+ * Copyright 2011 Jose Fonseca
+ * All Rights Reserved.
+ *
+ * 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:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * 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.
+ *
+ **************************************************************************/
+
+
+#include <assert.h>
+
+#include <iostream>
+#include <algorithm>
+
+#include "image.hpp"
+#include "d3d10imports.hpp"
+
+
+namespace d3dstate {
+
+static HRESULT
+stageResource(ID3D10Device *pDevice,
+ ID3D10Resource *pResource,
+ ID3D10Resource **ppStagingResource,
+ UINT *pWidth, UINT *pHeight, UINT *pDepth) {
+ D3D10_USAGE Usage = D3D10_USAGE_STAGING;
+ UINT BindFlags = 0;
+ UINT CPUAccessFlags = D3D10_CPU_ACCESS_READ;
+ UINT MiscFlags = 0;
+ union {
+ ID3D10Resource *pStagingResource;
+ ID3D10Buffer *pStagingBuffer;
+ ID3D10Texture1D *pStagingTexture1D;
+ ID3D10Texture2D *pStagingTexture2D;
+ ID3D10Texture3D *pStagingTexture3D;
+ };
+ HRESULT hr;
+
+ D3D10_RESOURCE_DIMENSION Type = D3D10_RESOURCE_DIMENSION_UNKNOWN;
+ pResource->GetType(&Type);
+ switch (Type) {
+ case D3D10_RESOURCE_DIMENSION_BUFFER:
+ {
+ D3D10_BUFFER_DESC Desc;
+ static_cast<ID3D10Buffer *>(pResource)->GetDesc(&Desc);
+ Desc.Usage = Usage;
+ Desc.BindFlags = BindFlags;
+ Desc.CPUAccessFlags = CPUAccessFlags;
+ Desc.MiscFlags = MiscFlags;
+
+ *pWidth = Desc.ByteWidth;
+ *pHeight = 1;
+ *pDepth = 1;
+
+ hr = pDevice->CreateBuffer(&Desc, NULL, &pStagingBuffer);
+ }
+ break;
+ case D3D10_RESOURCE_DIMENSION_TEXTURE1D:
+ {
+ D3D10_TEXTURE1D_DESC Desc;
+ static_cast<ID3D10Texture1D *>(pResource)->GetDesc(&Desc);
+ Desc.Usage = Usage;
+ Desc.BindFlags = BindFlags;
+ Desc.CPUAccessFlags = CPUAccessFlags;
+ Desc.MiscFlags = MiscFlags;
+
+ *pWidth = Desc.Width;
+ *pHeight = 1;
+ *pDepth = 1;
+
+ hr = pDevice->CreateTexture1D(&Desc, NULL, &pStagingTexture1D);
+ }
+ break;
+ case D3D10_RESOURCE_DIMENSION_TEXTURE2D:
+ {
+ D3D10_TEXTURE2D_DESC Desc;
+ static_cast<ID3D10Texture2D *>(pResource)->GetDesc(&Desc);
+ Desc.Usage = Usage;
+ Desc.BindFlags = BindFlags;
+ Desc.CPUAccessFlags = CPUAccessFlags;
+ Desc.MiscFlags &= ~D3D10_RESOURCE_MISC_TEXTURECUBE;
+
+ *pWidth = Desc.Width;
+ *pHeight = Desc.Height;
+ *pDepth = 1;
+
+ hr = pDevice->CreateTexture2D(&Desc, NULL, &pStagingTexture2D);
+ }
+ break;
+ case D3D10_RESOURCE_DIMENSION_TEXTURE3D:
+ {
+ D3D10_TEXTURE3D_DESC Desc;
+ static_cast<ID3D10Texture3D *>(pResource)->GetDesc(&Desc);
+ Desc.Usage = Usage;
+ Desc.BindFlags = BindFlags;
+ Desc.CPUAccessFlags = CPUAccessFlags;
+ Desc.MiscFlags = MiscFlags;
+
+ *pWidth = Desc.Width;
+ *pHeight = Desc.Height;
+ *pDepth = Desc.Depth;
+
+ hr = pDevice->CreateTexture3D(&Desc, NULL, &pStagingTexture3D);
+ }
+ break;
+ default:
+ assert(0);
+ hr = E_NOTIMPL;
+ break;
+ }
+
+ if (SUCCEEDED(hr)) {
+ *ppStagingResource = pStagingResource;
+ pDevice->CopyResource(pStagingResource, pResource);
+ }
+
+ return hr;
+}
+
+static HRESULT
+mapResource(ID3D10Resource *pResource,
+ UINT Subresource, D3D10_MAP MapType, UINT MapFlags,
+ D3D10_MAPPED_TEXTURE3D *pMappedSubresource) {
+ D3D10_RESOURCE_DIMENSION Type = D3D10_RESOURCE_DIMENSION_UNKNOWN;
+ pResource->GetType(&Type);
+ switch (Type) {
+ case D3D10_RESOURCE_DIMENSION_BUFFER:
+ assert(Subresource == 0);
+ return static_cast<ID3D10Buffer *>(pResource)->Map(MapType, MapFlags, &pMappedSubresource->pData);
+ case D3D10_RESOURCE_DIMENSION_TEXTURE1D:
+ return static_cast<ID3D10Texture1D *>(pResource)->Map(Subresource, MapType, MapFlags, &pMappedSubresource->pData);
+ case D3D10_RESOURCE_DIMENSION_TEXTURE2D:
+ return static_cast<ID3D10Texture2D *>(pResource)->Map(Subresource, MapType, MapFlags, reinterpret_cast<D3D10_MAPPED_TEXTURE2D *>(pMappedSubresource));
+ case D3D10_RESOURCE_DIMENSION_TEXTURE3D:
+ return static_cast<ID3D10Texture3D *>(pResource)->Map(Subresource, MapType, MapFlags, pMappedSubresource);
+ default:
+ assert(0);
+ return E_NOTIMPL;
+ }
+}
+
+static void
+unmapResource(ID3D10Resource *pResource, UINT Subresource) {
+ D3D10_RESOURCE_DIMENSION Type = D3D10_RESOURCE_DIMENSION_UNKNOWN;
+ pResource->GetType(&Type);
+ switch (Type) {
+ case D3D10_RESOURCE_DIMENSION_BUFFER:
+ assert(Subresource == 0);
+ static_cast<ID3D10Buffer *>(pResource)->Unmap();
+ break;
+ case D3D10_RESOURCE_DIMENSION_TEXTURE1D:
+ static_cast<ID3D10Texture1D *>(pResource)->Unmap(Subresource);
+ break;
+ case D3D10_RESOURCE_DIMENSION_TEXTURE2D:
+ static_cast<ID3D10Texture2D *>(pResource)->Unmap(Subresource);
+ break;
+ case D3D10_RESOURCE_DIMENSION_TEXTURE3D:
+ static_cast<ID3D10Texture3D *>(pResource)->Unmap(Subresource);
+ break;
+ default:
+ assert(0);
+ }
+}
+
+image::Image *
+getRenderTargetImage(ID3D10Device *pDevice) {
+ image::Image *image = NULL;
+ ID3D10RenderTargetView *pRenderTargetView = NULL;
+ D3D10_RENDER_TARGET_VIEW_DESC Desc;
+ ID3D10Resource *pResource = NULL;
+ ID3D10Resource *pStagingResource = NULL;
+ UINT Width, Height, Depth;
+ UINT MipSlice;
+ UINT Subresource;
+ D3D10_MAPPED_TEXTURE3D MappedSubresource;
+ HRESULT hr;
+ const unsigned char *src;
+ unsigned char *dst;
+
+ pDevice->OMGetRenderTargets(1, &pRenderTargetView, NULL);
+ if (!pRenderTargetView) {
+ goto no_rendertarget;
+ }
+
+ pRenderTargetView->GetResource(&pResource);
+ assert(pResource);
+
+ pRenderTargetView->GetDesc(&Desc);
+ if (Desc.Format != DXGI_FORMAT_R8G8B8A8_UNORM &&
+ Desc.Format != DXGI_FORMAT_R32G32B32A32_FLOAT &&
+ Desc.Format != DXGI_FORMAT_B8G8R8A8_UNORM) {
+ std::cerr << "warning: unsupported DXGI format " << Desc.Format << "\n";
+ goto no_staging;
+ }
+
+ hr = stageResource(pDevice, pResource, &pStagingResource, &Width, &Height, &Depth);
+ if (FAILED(hr)) {
+ goto no_staging;
+ }
+
+ // TODO: Take the slice in consideration
+ switch (Desc.ViewDimension) {
+ case D3D10_RTV_DIMENSION_BUFFER:
+ MipSlice = 0;
+ break;
+ case D3D10_RTV_DIMENSION_TEXTURE1D:
+ MipSlice = Desc.Texture1D.MipSlice;
+ break;
+ case D3D10_RTV_DIMENSION_TEXTURE1DARRAY:
+ MipSlice = Desc.Texture1DArray.MipSlice;
+ break;
+ case D3D10_RTV_DIMENSION_TEXTURE2D:
+ MipSlice = Desc.Texture2D.MipSlice;
+ MipSlice = 0;
+ break;
+ case D3D10_RTV_DIMENSION_TEXTURE2DARRAY:
+ MipSlice = Desc.Texture2DArray.MipSlice;
+ break;
+ case D3D10_RTV_DIMENSION_TEXTURE2DMS:
+ MipSlice = 0;
+ break;
+ case D3D10_RTV_DIMENSION_TEXTURE2DMSARRAY:
+ MipSlice = 0;
+ break;
+ case D3D10_RTV_DIMENSION_TEXTURE3D:
+ MipSlice = Desc.Texture3D.MipSlice;
+ break;
+ case D3D10_SRV_DIMENSION_UNKNOWN:
+ default:
+ assert(0);
+ goto no_map;
+ }
+ Subresource = MipSlice;
+
+ Width = std::max(Width >> MipSlice, 1U);
+ Height = std::max(Height >> MipSlice, 1U);
+ Depth = std::max(Depth >> MipSlice, 1U);
+
+ hr = mapResource(pStagingResource, Subresource, D3D10_MAP_READ, 0, &MappedSubresource);
+ if (FAILED(hr)) {
+ goto no_map;
+ }
+
+ image = new image::Image(Width, Height, 4, true);
+ if (!image) {
+ goto no_image;
+ }
+
+ dst = image->start();
+ src = (const unsigned char *)MappedSubresource.pData;
+ for (unsigned y = 0; y < Height; ++y) {
+ if (Desc.Format == DXGI_FORMAT_R8G8B8A8_UNORM) {
+ memcpy(dst, src, Width * 4);
+ } else if (Desc.Format == DXGI_FORMAT_R32G32B32A32_FLOAT) {
+ float scale = 1.0f/255.0f;
+ for (unsigned x = 0; x < Width; ++x) {
+ dst[4*x + 0] = ((float *)src)[4*x + 0] * scale;
+ dst[4*x + 1] = ((float *)src)[4*x + 1] * scale;
+ dst[4*x + 2] = ((float *)src)[4*x + 2] * scale;
+ dst[4*x + 3] = ((float *)src)[4*x + 3] * scale;
+ }
+ } else if (Desc.Format == DXGI_FORMAT_B8G8R8A8_UNORM) {
+ for (unsigned x = 0; x < Width; ++x) {
+ dst[4*x + 0] = src[4*x + 2];
+ dst[4*x + 1] = src[4*x + 1];
+ dst[4*x + 2] = src[4*x + 0];
+ dst[4*x + 3] = src[4*x + 3];
+ }
+ } else {
+ assert(0);
+ }
+ src += MappedSubresource.RowPitch;
+ dst += image->stride();
+ }
+
+no_image:
+ unmapResource(pStagingResource, Subresource);
+no_map:
+ if (pStagingResource) {
+ pStagingResource->Release();
+ }
+no_staging:
+ if (pResource) {
+ pResource->Release();
+ }
+ if (pRenderTargetView) {
+ pRenderTargetView->Release();
+ }
+no_rendertarget:
+ return image;
+}
+
+
+} /* namespace d3dstate */
void
-dumpDevice(std::ostream &os, ID3D11DeviceContext *pDevice)
+dumpDevice(std::ostream &os, ID3D11DeviceContext *pDeviceContext)
{
JSONWriter json(os);
def invokeInterfaceMethod(self, interface, method):
# keep track of the last used device for state dumping
+ if interface.name in ('ID3D10Device', 'ID3D10Device1'):
+ if method.name == 'Release':
+ print r' d3d10Dumper.unbindDevice(_this);'
+ else:
+ print r' d3d10Dumper.bindDevice(_this);'
if interface.name in ('ID3D11DeviceContext',):
if method.name == 'Release':
print r' d3d11Dumper.unbindDevice(_this);'
moduleNames = sys.argv[1:]
api = API()
+
if moduleNames:
api.addModule(dxgi)
+
if 'd3d10' in moduleNames:
if 'd3d10_1' in moduleNames:
print r'#include "d3d10_1imports.hpp"'
print r'#include "d3d10imports.hpp"'
print r'#include "d3d10size.hpp"'
api.addModule(d3d10)
+ print
+ print '''static d3dretrace::D3DDumper<ID3D10Device> d3d10Dumper;'''
+ print
+
if 'd3d11' in moduleNames:
print r'#include "d3d11imports.hpp"'
if 'd3d11_1' in moduleNames:
struct IDirect3DDevice9;
+struct ID3D10Device;
struct ID3D11DeviceContext;
dumpDevice(std::ostream &os, IDirect3DDevice9 *pDevice);
+image::Image *
+getRenderTargetImage(ID3D10Device *pDevice);
+
+void
+dumpDevice(std::ostream &os, ID3D10Device *pDevice);
+
+
image::Image *
getRenderTargetImage(ID3D11DeviceContext *pDeviceContext);
"D3D10_FORMAT_SUPPORT_MULTISAMPLE_RENDERTARGET",
"D3D10_FORMAT_SUPPORT_MULTISAMPLE_LOAD",
"D3D10_FORMAT_SUPPORT_SHADER_GATHER",
+ "D3D10_FORMAT_SUPPORT_BACK_BUFFER_CAST",
])
D3D10_COUNTER = Enum("D3D10_COUNTER", [
"D3D10_CREATE_DEVICE_ALLOW_NULL_FROM_MAP",
"D3D10_CREATE_DEVICE_BGRA_SUPPORT",
"D3D10_CREATE_DEVICE_STRICT_VALIDATION",
+ "D3D10_CREATE_DEVICE_BGRA_SUPPORT",
+ "D3D10_CREATE_DEVICE_PREVENT_ALTERING_LAYER_SETTINGS_FROM_REGISTRY",
+ "D3D10_CREATE_DEVICE_STRICT_VALIDATION",
+ "D3D10_CREATE_DEVICE_DEBUGGABLE",
])
D3D10_RAISE_FLAG = Flags(UINT, [
StdMethod(HRESULT, "SetFullscreenState", [(BOOL, "Fullscreen"), (ObjPointer(IDXGIOutput), "pTarget")]),
StdMethod(HRESULT, "GetFullscreenState", [Out(Pointer(BOOL), "pFullscreen"), Out(Pointer(ObjPointer(IDXGIOutput)), "ppTarget")]),
StdMethod(HRESULT, "GetDesc", [Out(Pointer(DXGI_SWAP_CHAIN_DESC), "pDesc")], sideeffects=False),
- StdMethod(HRESULT, "ResizeBuffers", [(UINT, "BufferCount"), (UINT, "Width"), (UINT, "Height"), (DXGI_FORMAT, "NewFormat"), (UINT, "SwapChainFlags")]),
+ StdMethod(HRESULT, "ResizeBuffers", [(UINT, "BufferCount"), (UINT, "Width"), (UINT, "Height"), (DXGI_FORMAT, "NewFormat"), (DXGI_SWAP_CHAIN_FLAG, "SwapChainFlags")]),
StdMethod(HRESULT, "ResizeTarget", [(Pointer(Const(DXGI_MODE_DESC)), "pNewTargetParameters")]),
StdMethod(HRESULT, "GetContainingOutput", [Out(Pointer(ObjPointer(IDXGIOutput)), "ppOutput")]),
StdMethod(HRESULT, "GetFrameStatistics", [Out(Pointer(DXGI_FRAME_STATISTICS), "pStats")], sideeffects=False),
StdMethod(HRESULT, "GetMaximumFrameLatency", [Out(Pointer(UINT), "pMaxLatency")], sideeffects=False),
]
+
+IDXGIFactoryDWM = Interface("IDXGIFactoryDWM", IUnknown)
+IDXGISwapChainDWM = Interface("IDXGISwapChainDWM", IDXGIDeviceSubObject)
+
+IDXGIFactoryDWM.methods += [
+ StdMethod(HRESULT, "CreateSwapChain", [(ObjPointer(IUnknown), "pDevice"), (Pointer(DXGI_SWAP_CHAIN_DESC), "pDesc"), (ObjPointer(IDXGIOutput), "pOutput"), Out(Pointer(ObjPointer(IDXGISwapChainDWM)), "ppSwapChain")]),
+]
+
+IDXGISwapChainDWM.methods += [
+ StdMethod(HRESULT, "Present", [(UINT, "SyncInterval"), (DXGI_PRESENT, "Flags")]),
+ StdMethod(HRESULT, "GetBuffer", [(UINT, "Buffer"), (REFIID, "riid"), Out(Pointer(ObjPointer(Void)), "ppSurface")]),
+ StdMethod(HRESULT, "GetDesc", [Out(Pointer(DXGI_SWAP_CHAIN_DESC), "pDesc")], sideeffects=False),
+ StdMethod(HRESULT, "ResizeBuffers", [(UINT, "BufferCount"), (UINT, "Width"), (UINT, "Height"), (DXGI_FORMAT, "NewFormat"), (DXGI_SWAP_CHAIN_FLAG, "SwapChainFlags")]),
+ StdMethod(HRESULT, "ResizeTarget", [(Pointer(Const(DXGI_MODE_DESC)), "pNewTargetParameters")]),
+ StdMethod(HRESULT, "GetContainingOutput", [Out(Pointer(ObjPointer(IDXGIOutput)), "ppOutput")]),
+ StdMethod(HRESULT, "GetFrameStatistics", [(Pointer(DXGI_FRAME_STATISTICS), "pStats")], sideeffects=False),
+ StdMethod(HRESULT, "GetLastPresentCount", [(Pointer(UINT), "pLastPresentCount")], sideeffects=False),
+ StdMethod(HRESULT, "SetFullscreenState", [(BOOL, "Fullscreen"), (ObjPointer(IDXGIOutput), "pTarget")]),
+ StdMethod(HRESULT, "GetFullscreenState", [Out(Pointer(BOOL), "pFullscreen"), Out(Pointer(ObjPointer(IDXGIOutput)), "ppTarget")]),
+]
+
+
dxgi = Module('dxgi')
dxgi.addInterfaces([
- IDXGIFactory1
+ IDXGIFactory1,
+ IDXGIFactoryDWM,
])
dxgi.addFunctions([
StdFunction(HRESULT, "CreateDXGIFactory", [(REFIID, "riid"), Out(Pointer(ObjPointer(Void)), "ppFactory")]),
self.consume()
self.consume(':')
else:
- self.parse_prototype('StdMethod')
+ self.parse_prototype('Method')
self.consume(';')
self.consume('}')
ret = self.parse_type()
- if self.match('__stdcall', 'WINAPI'):
+ if self.match('__stdcall', 'WINAPI', 'STDMETHODCALLTYPE'):
self.consume()
creator = 'Std' + creator
D3D10StateBlockMaskGetSetting
D3D10StateBlockMaskIntersect
D3D10StateBlockMaskUnion
+
+ CreateDXGIFactory
+ CreateDXGIFactory1
LIBRARY "d3d10_1"
EXPORTS
- D3D10CreateDevice1
- D3D10CreateDeviceAndSwapChain1
- D3D10CreateBlob
+ D3D10CreateDevice1
+ D3D10CreateDeviceAndSwapChain1
+ D3D10CreateBlob
+
+ CreateDXGIFactory
+ CreateDXGIFactory1
from d3dcommontrace import D3DCommonTracer
from specs.stdapi import API
+from specs.dxgi import dxgi
from specs.d3d10_1 import d3d10_1
print
api = API()
+ api.addModule(dxgi)
api.addModule(d3d10_1)
tracer = D3DCommonTracer()
tracer.traceApi(api)
from d3dcommontrace import D3DCommonTracer
from specs.stdapi import API
+from specs.dxgi import dxgi
from specs.d3d10misc import d3d10
print
api = API()
+ api.addModule(dxgi)
api.addModule(d3d10)
tracer = D3DCommonTracer()
tracer.traceApi(api)
projects / apitrace / commitdiff