mirrors
/
dxvk
mirror of https://github.com/doitsujin/dxvk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[meta] Fix formatting errors 

Some filthy little tabs have somehow made
it into the world of spaces to wreak havoc.
This commit is contained in:
Philip Rebohle 2018-08-13 18:30:51 +02:00
parent 8a44011fde
commit 861165f32a
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
3 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meson.build
View File

@ -14,7 +14,7 @@ else
endif endif
if dxvk_compiler.get_id() == 'msvc' if dxvk_compiler.get_id() == 'msvc'
add_project_arguments('/std:' + dxvk_cpp_std, language : 'cpp') add_project_arguments('/std:' + dxvk_cpp_std, language : 'cpp')
endif endif
dxvk_include_path = include_directories('./include') dxvk_include_path = include_directories('./include')

70
src/d3d10/d3d10_main.cpp
View File

@ -215,39 +215,39 @@ extern "C" {
} }
const char* STDMETHODCALLTYPE D3D10GetVertexShaderProfile (ID3D10Device*) { return "vs_4_1"; } const char* STDMETHODCALLTYPE D3D10GetVertexShaderProfile (ID3D10Device*) { return "vs_4_1"; }
const char* STDMETHODCALLTYPE D3D10GetGeometryShaderProfile (ID3D10Device*) { return "gs_4_1"; } const char* STDMETHODCALLTYPE D3D10GetGeometryShaderProfile (ID3D10Device*) { return "gs_4_1"; }
const char* STDMETHODCALLTYPE D3D10GetPixelShaderProfile (ID3D10Device*) { return "ps_4_1"; } const char* STDMETHODCALLTYPE D3D10GetPixelShaderProfile (ID3D10Device*) { return "ps_4_1"; }
HRESULT STDMETHODCALLTYPE D3D10CreateBlob(SIZE_T size, LPD3D10BLOB* ppBuffer) { HRESULT STDMETHODCALLTYPE D3D10CreateBlob(SIZE_T size, LPD3D10BLOB* ppBuffer) {
return D3DCreateBlob(size, ppBuffer); return D3DCreateBlob(size, ppBuffer);
} }
HRESULT STDMETHODCALLTYPE D3D10GetInputSignatureBlob( HRESULT STDMETHODCALLTYPE D3D10GetInputSignatureBlob(
const void* pShaderBytecode, const void* pShaderBytecode,
SIZE_T BytecodeLength, SIZE_T BytecodeLength,
ID3D10Blob** ppSignatureBlob) { ID3D10Blob** ppSignatureBlob) {
return D3DGetInputSignatureBlob( return D3DGetInputSignatureBlob(
pShaderBytecode, pShaderBytecode,
BytecodeLength, BytecodeLength,
ppSignatureBlob); ppSignatureBlob);
} }
HRESULT STDMETHODCALLTYPE D3D10GetOutputSignatureBlob( HRESULT STDMETHODCALLTYPE D3D10GetOutputSignatureBlob(
const void* pShaderBytecode, const void* pShaderBytecode,
SIZE_T BytecodeLength, SIZE_T BytecodeLength,
ID3D10Blob** ppSignatureBlob) { ID3D10Blob** ppSignatureBlob) {
return D3DGetOutputSignatureBlob( return D3DGetOutputSignatureBlob(
pShaderBytecode, pShaderBytecode,
BytecodeLength, BytecodeLength,
ppSignatureBlob); ppSignatureBlob);
} }
HRESULT STDMETHODCALLTYPE D3D10ReflectShader( HRESULT STDMETHODCALLTYPE D3D10ReflectShader(
const void* pShaderBytecode, const void* pShaderBytecode,
SIZE_T BytecodeLength, SIZE_T BytecodeLength,
ID3D10ShaderReflection** ppReflector) { ID3D10ShaderReflection** ppReflector) {
@ -258,7 +258,7 @@ extern "C" {
Com<ID3D11ShaderReflection> d3d11Reflector = nullptr; Com<ID3D11ShaderReflection> d3d11Reflector = nullptr;
HRESULT hr = D3DReflect(pShaderBytecode, HRESULT hr = D3DReflect(pShaderBytecode,
BytecodeLength, IID_ID3D11ShaderReflection, BytecodeLength, IID_ID3D11ShaderReflection,
reinterpret_cast<void**>(&d3d11Reflector)); reinterpret_cast<void**>(&d3d11Reflector));
@ -269,10 +269,10 @@ extern "C" {
*ppReflector = ref(new D3D10ShaderReflection(d3d11Reflector.ptr())); *ppReflector = ref(new D3D10ShaderReflection(d3d11Reflector.ptr()));
return S_OK; return S_OK;
} }
HRESULT STDMETHODCALLTYPE D3D10CompileShader( HRESULT STDMETHODCALLTYPE D3D10CompileShader(
LPCSTR pSrcData, LPCSTR pSrcData,
SIZE_T SrcDataSize, SIZE_T SrcDataSize,
LPCSTR pFileName, LPCSTR pFileName,
@ -283,13 +283,13 @@ extern "C" {
UINT Flags, UINT Flags,
ID3D10Blob** ppShader, ID3D10Blob** ppShader,
ID3D10Blob** ppErrorMsgs) { ID3D10Blob** ppErrorMsgs) {
return D3DCompile(pSrcData, SrcDataSize, pFileName, return D3DCompile(pSrcData, SrcDataSize, pFileName,
pDefines, pInclude, pFunctionName, pProfile, Flags, pDefines, pInclude, pFunctionName, pProfile, Flags,
0, ppShader, ppErrorMsgs); 0, ppShader, ppErrorMsgs);
} }
HRESULT STDMETHODCALLTYPE D3D10CreateEffectFromMemory( HRESULT STDMETHODCALLTYPE D3D10CreateEffectFromMemory(
void* pData, void* pData,
SIZE_T DataSize, SIZE_T DataSize,
UINT EffectFlags, UINT EffectFlags,
@ -297,22 +297,22 @@ extern "C" {
ID3D10EffectPool* pEffectPool, ID3D10EffectPool* pEffectPool,
ID3D10Effect** ppEffect) { ID3D10Effect** ppEffect) {
Logger::warn("D3D10CreateEffectFromMemory: Not implemented"); Logger::warn("D3D10CreateEffectFromMemory: Not implemented");
return E_NOTIMPL; return E_NOTIMPL;
} }
HRESULT STDMETHODCALLTYPE D3D10CreateEffectPoolFromMemory( HRESULT STDMETHODCALLTYPE D3D10CreateEffectPoolFromMemory(
void* pData, void* pData,
SIZE_T DataSize, SIZE_T DataSize,
UINT EffectFlags, UINT EffectFlags,
ID3D10Device* pDevice, ID3D10Device* pDevice,
ID3D10EffectPool** ppEffectPool) { ID3D10EffectPool** ppEffectPool) {
Logger::warn("D3D10CreateEffectPoolFromMemory: Not implemented"); Logger::warn("D3D10CreateEffectPoolFromMemory: Not implemented");
return E_NOTIMPL; return E_NOTIMPL;
} }
HRESULT STDMETHODCALLTYPE D3D10CompileEffectFromMemory( HRESULT STDMETHODCALLTYPE D3D10CompileEffectFromMemory(
void* pData, void* pData,
SIZE_T DataLength, SIZE_T DataLength,
LPCSTR pSrcFileName, LPCSTR pSrcFileName,
@ -323,32 +323,32 @@ extern "C" {
ID3D10Blob** ppCompiledEffect, ID3D10Blob** ppCompiledEffect,
ID3D10Blob** ppErrors) { ID3D10Blob** ppErrors) {
Logger::warn("D3D10CompileEffectFromMemory: Not implemented"); Logger::warn("D3D10CompileEffectFromMemory: Not implemented");
return E_NOTIMPL; return E_NOTIMPL;
} }
HRESULT STDMETHODCALLTYPE D3D10DisassembleEffect( HRESULT STDMETHODCALLTYPE D3D10DisassembleEffect(
ID3D10Effect* pEffect, ID3D10Effect* pEffect,
BOOL EnableColorCode, BOOL EnableColorCode,
ID3D10Blob** ppDisassembly) { ID3D10Blob** ppDisassembly) {
Logger::warn("D3D10DisassembleEffect: Not implemented"); Logger::warn("D3D10DisassembleEffect: Not implemented");
return E_NOTIMPL; return E_NOTIMPL;
} }
HRESULT STDMETHODCALLTYPE D3D10DisassembleShader( HRESULT STDMETHODCALLTYPE D3D10DisassembleShader(
const void* pShader, const void* pShader,
SIZE_T BytecodeLength, SIZE_T BytecodeLength,
BOOL EnableColorCode, BOOL EnableColorCode,
LPCSTR pComments, LPCSTR pComments,
ID3D10Blob** ppDisassembly) { ID3D10Blob** ppDisassembly) {
return D3DDisassemble( return D3DDisassemble(
pShader, BytecodeLength, pShader, BytecodeLength,
0, pComments, ppDisassembly); 0, pComments, ppDisassembly);
} }
HRESULT STDMETHODCALLTYPE D3D10PreprocessShader( HRESULT STDMETHODCALLTYPE D3D10PreprocessShader(
LPCSTR pSrcData, LPCSTR pSrcData,
SIZE_T SrcDataSize, SIZE_T SrcDataSize,
LPCSTR pFileName, LPCSTR pFileName,
@ -356,13 +356,13 @@ extern "C" {
LPD3D10INCLUDE pInclude, LPD3D10INCLUDE pInclude,
ID3D10Blob** ppShaderText, ID3D10Blob** ppShaderText,
ID3D10Blob** ppErrorMsgs) { ID3D10Blob** ppErrorMsgs) {
return D3DPreprocess( return D3DPreprocess(
pSrcData, SrcDataSize, pSrcData, SrcDataSize,
pFileName, pDefines, pFileName, pDefines,
pInclude, pInclude,
ppShaderText, ppShaderText,
ppErrorMsgs); ppErrorMsgs);
} }
} }

4
src/spirv/spirv_module.cpp
View File

@ -620,11 +620,11 @@ namespace dxvk {
spv::ImageFormat format) { spv::ImageFormat format) {
std::array<uint32_t, 7> args = {{ std::array<uint32_t, 7> args = {{
sampledType, sampledType,
static_cast<uint32_t>(dimensionality), static_cast<uint32_t>(dimensionality),
depth, arrayed, depth, arrayed,
multisample, multisample,
sampled, sampled,
static_cast<uint32_t>(format) static_cast<uint32_t>(format)
}}; }};
return this->defType(spv::OpTypeImage, return this->defType(spv::OpTypeImage,