summaryrefslogtreecommitdiffstats
path: root/src/gallium/state_trackers/d3d1x/dxgid3d10
diff options
context:
space:
mode:
Diffstat (limited to 'src/gallium/state_trackers/d3d1x/dxgid3d10')
-rw-r--r--src/gallium/state_trackers/d3d1x/dxgid3d10/dxgid3d10.cpp98
1 files changed, 49 insertions, 49 deletions
diff --git a/src/gallium/state_trackers/d3d1x/dxgid3d10/dxgid3d10.cpp b/src/gallium/state_trackers/d3d1x/dxgid3d10/dxgid3d10.cpp
index 98ed6ac66ac..96073d4ebc6 100644
--- a/src/gallium/state_trackers/d3d1x/dxgid3d10/dxgid3d10.cpp
+++ b/src/gallium/state_trackers/d3d1x/dxgid3d10/dxgid3d10.cpp
@@ -4,15 +4,15 @@
*
* 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
+ * "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
+ * 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 (including the
* next paragraph) shall be included in all copies or substantial
- * portions of the Software.
+ * 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
@@ -31,18 +31,18 @@
#include <pipe/p_context.h>
HRESULT D3D10CreateDevice1(
- IDXGIAdapter *pAdapter,
- D3D10_DRIVER_TYPE DriverType,
- HMODULE Software,
- unsigned Flags,
- D3D10_FEATURE_LEVEL1 HardwareLevel,
- unsigned SDKVersion,
- ID3D10Device1 **ppDevice
+ IDXGIAdapter *adapter,
+ D3D10_DRIVER_TYPE driver_type,
+ HMODULE software,
+ unsigned flags,
+ D3D10_FEATURE_LEVEL1 hardware_level,
+ unsigned sdk_version,
+ ID3D10Device1 **out_device
)
{
HRESULT hr;
ComPtr<IDXGIAdapter1> adapter_to_release;
- if(!pAdapter)
+ if(!adapter)
{
ComPtr<IDXGIFactory1> factory;
hr = CreateDXGIFactory1(IID_IDXGIFactory1, (void**)&factory);
@@ -51,17 +51,17 @@ HRESULT D3D10CreateDevice1(
hr = factory->EnumAdapters1(0, &adapter_to_release);
if(!SUCCEEDED(hr))
return hr;
- pAdapter = adapter_to_release.p;
+ adapter = adapter_to_release.p;
}
ComPtr<IGalliumAdapter> gallium_adapter;
- hr = pAdapter->QueryInterface(IID_IGalliumAdapter, (void**)&gallium_adapter);
+ hr = adapter->QueryInterface(IID_IGalliumAdapter, (void**)&gallium_adapter);
if(!SUCCEEDED(hr))
return hr;
struct pipe_screen* screen;
// TODO: what should D3D_DRIVER_TYPE_SOFTWARE return? fast or reference?
- if(DriverType == D3D10_DRIVER_TYPE_REFERENCE)
+ if(driver_type == D3D10_DRIVER_TYPE_REFERENCE)
screen = gallium_adapter->GetGalliumReferenceSoftwareScreen();
- else if(DriverType == D3D10_DRIVER_TYPE_SOFTWARE || DriverType == D3D10_DRIVER_TYPE_WARP)
+ else if(driver_type == D3D10_DRIVER_TYPE_SOFTWARE || driver_type == D3D10_DRIVER_TYPE_WARP)
screen = gallium_adapter->GetGalliumFastSoftwareScreen();
else
screen = gallium_adapter->GetGalliumScreen();
@@ -71,35 +71,35 @@ HRESULT D3D10CreateDevice1(
if(!context)
return E_FAIL;
ComPtr<ID3D10Device1> device;
- hr = GalliumD3D10DeviceCreate1(screen, context, TRUE, Flags, pAdapter, &device);
+ hr = GalliumD3D10DeviceCreate1(screen, context, TRUE, flags, adapter, &device);
if(!SUCCEEDED(hr))
{
context->destroy(context);
return hr;
}
- if(ppDevice)
- *ppDevice = device.steal();
+ if(out_device)
+ *out_device = device.steal();
return S_OK;
}
HRESULT WINAPI D3D10CreateDeviceAndSwapChain1(
- IDXGIAdapter* pAdapter,
- D3D10_DRIVER_TYPE DriverType,
- HMODULE Software,
- unsigned Flags,
- D3D10_FEATURE_LEVEL1 HardwareLevel,
- unsigned SDKVersion,
- DXGI_SWAP_CHAIN_DESC* pSwapChainDesc,
- IDXGISwapChain** ppSwapChain,
- ID3D10Device1** ppDevice
+ IDXGIAdapter* adapter,
+ D3D10_DRIVER_TYPE driver_type,
+ HMODULE software,
+ unsigned flags,
+ D3D10_FEATURE_LEVEL1 hardware_level,
+ unsigned sdk_version,
+ DXGI_SWAP_CHAIN_DESC* swap_chain_desc,
+ IDXGISwapChain** out_swap_chain,
+ ID3D10Device1** out_device
)
{
ComPtr<ID3D10Device1> dev;
HRESULT hr;
- hr = D3D10CreateDevice1(pAdapter, DriverType, Software, Flags, HardwareLevel, SDKVersion, &dev);
+ hr = D3D10CreateDevice1(adapter, driver_type, software, flags, hardware_level, sdk_version, &dev);
if(!SUCCEEDED(hr))
return hr;
- if(ppSwapChain)
+ if(out_swap_chain)
{
ComPtr<IDXGIFactory> factory;
ComPtr<IDXGIDevice> dxgi_device;
@@ -113,37 +113,37 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain1(
return hr;
adapter->GetParent(IID_IDXGIFactory, (void**)&factory);
- hr = factory->CreateSwapChain(dev.p, (DXGI_SWAP_CHAIN_DESC*)pSwapChainDesc, ppSwapChain);
+ hr = factory->CreateSwapChain(dev.p, (DXGI_SWAP_CHAIN_DESC*)swap_chain_desc, out_swap_chain);
if(!SUCCEEDED(hr))
return hr;
}
- if(ppDevice)
- *ppDevice = dev.steal();
+ if(out_device)
+ *out_device = dev.steal();
return hr;
}
HRESULT D3D10CreateDevice(
- IDXGIAdapter *pAdapter,
- D3D10_DRIVER_TYPE DriverType,
- HMODULE Software,
- unsigned Flags,
- unsigned SDKVersion,
- ID3D10Device **ppDevice
+ IDXGIAdapter *adapter,
+ D3D10_DRIVER_TYPE driver_type,
+ HMODULE software,
+ unsigned flags,
+ unsigned sdk_version,
+ ID3D10Device **out_device
)
{
- return D3D10CreateDevice1(pAdapter, DriverType, Software, Flags, D3D10_FEATURE_LEVEL_10_0, SDKVersion, (ID3D10Device1**)ppDevice);
+ return D3D10CreateDevice1(adapter, driver_type, software, flags, D3D10_FEATURE_LEVEL_10_0, sdk_version, (ID3D10Device1**)out_device);
}
HRESULT WINAPI D3D10CreateDeviceAndSwapChain(
- IDXGIAdapter* pAdapter,
- D3D10_DRIVER_TYPE DriverType,
- HMODULE Software,
- unsigned Flags,
- unsigned SDKVersion,
- DXGI_SWAP_CHAIN_DESC* pSwapChainDesc,
- IDXGISwapChain** ppSwapChain,
- ID3D10Device** ppDevice
+ IDXGIAdapter* adapter,
+ D3D10_DRIVER_TYPE driver_type,
+ HMODULE software,
+ unsigned flags,
+ unsigned sdk_version,
+ DXGI_SWAP_CHAIN_DESC* swap_chain_desc,
+ IDXGISwapChain** out_swap_chain,
+ ID3D10Device** out_device
)
{
- return D3D10CreateDeviceAndSwapChain1(pAdapter, DriverType, Software, Flags, D3D10_FEATURE_LEVEL_10_0, SDKVersion, pSwapChainDesc, ppSwapChain, (ID3D10Device1**)ppDevice);
+ return D3D10CreateDeviceAndSwapChain1(adapter, driver_type, software, flags, D3D10_FEATURE_LEVEL_10_0, sdk_version, swap_chain_desc, out_swap_chain, (ID3D10Device1**)out_device);
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-27 06:45:59 +0000