Yidhra/DirectXTex
2
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex.git synced 2025-07-09 11:40:14 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean up GPU-based validation warnings (#309)

Browse Source
This commit is contained in:
Chuck Walbourn 2023-01-31 09:57:16 -08:00 committed by GitHub
parent 371643fce2
commit 126d15c39a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DDSTextureLoader/DDSTextureLoader12.cpp
View File

@ -1283,7 +1283,7 @@ namespace
&defaultHeapProperties, &defaultHeapProperties,
D3D12_HEAP_FLAG_NONE, D3D12_HEAP_FLAG_NONE,
&desc, &desc,
D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COMMON,
nullptr, nullptr,
IID_ID3D12Resource, reinterpret_cast<void**>(texture)); IID_ID3D12Resource, reinterpret_cast<void**>(texture));
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))

4
DirectXTex/DirectXTexD3D12.cpp
View File

@ -542,7 +542,11 @@ HRESULT DirectX::CreateTextureEx(
&defaultHeapProperties, &defaultHeapProperties,
D3D12_HEAP_FLAG_NONE, D3D12_HEAP_FLAG_NONE,
&desc, &desc,
#if (defined(_XBOX_ONE) && defined(_TITLE)) || defined(_GAMING_XBOX)
D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_DEST,
#else
D3D12_RESOURCE_STATE_COMMON,
#endif
nullptr, nullptr,
IID_GRAPHICS_PPV_ARGS(ppResource)); IID_GRAPHICS_PPV_ARGS(ppResource));

2
WICTextureLoader/WICTextureLoader12.cpp
View File

@ -617,7 +617,7 @@ namespace
&defaultHeapProperties, &defaultHeapProperties,
D3D12_HEAP_FLAG_NONE, D3D12_HEAP_FLAG_NONE,
&desc, &desc,
D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COMMON,
nullptr, nullptr,
IID_ID3D12Resource, IID_ID3D12Resource,
reinterpret_cast<void**>(&tex)); reinterpret_cast<void**>(&tex));

9
build/DirectXTex-GitHub-MinGW.yml
View File

@ -101,14 +101,13 @@ jobs:
inputs: inputs:
script: g++ --version script: g++ --version
- task: CmdLine@2 - task: CmdLine@2
# The error checks are commented out due to a bug with vcpkg not returning 0 on success.
displayName: VCPKG install headers displayName: VCPKG install headers
inputs: inputs:
script: | script: |
call vcpkg install directxmath call vcpkg install directxmath
REM @if ERRORLEVEL 1 goto error @if ERRORLEVEL 1 goto error
call vcpkg install directx-headers call vcpkg install directx-headers
REM @if ERRORLEVEL 1 goto error @if ERRORLEVEL 1 goto error
:finish :finish
@echo --- VCPKG COMPLETE --- @echo --- VCPKG COMPLETE ---
exit /b 0 exit /b 0
@ -203,9 +202,9 @@ jobs:
inputs: inputs:
script: | script: |
call vcpkg install directxmath call vcpkg install directxmath
REM @if ERRORLEVEL 1 goto error @if ERRORLEVEL 1 goto error
call vcpkg install directx-headers call vcpkg install directx-headers
REM @if ERRORLEVEL 1 goto error @if ERRORLEVEL 1 goto error
:finish :finish
@echo --- VCPKG COMPLETE --- @echo --- VCPKG COMPLETE ---
exit /b 0 exit /b 0