Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Most, however, are managed as linked submodule.
|-------------------------------|------------|----------|----------------------------------------------|---------------------------|
| Abseil Common Libraries (C++) | Apache-2.0 | 20211102 | https://abseil.io | Release 20211102 |
| C++ commandline parsing | MIT | 3.0.0 | https://github.com/jarro2783/cxxopts | In source tree |
| Eigen 3 | MPL2 | 3.4.0 | https://eigen.tuxfamily.org | |
| Eigen 3 | MPL2 | 5.0.0 | https://eigen.tuxfamily.org | |
| Expected lite | BSL-1.0 | 0.6.2 | https://github.com/martinmoene/expected-lite | In source tree |
| Google Test | BSD-3 | 1.11.0 | https://github.com/google/googletest | |
| Google Benchmark | Apache-2.0 | 1.5.5 | https://github.com/google/benchmark | |
Expand Down
8 changes: 4 additions & 4 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
configGraphicsOpenGL: 'on'
configGraphicsEGL: 'on'
pool:
vmImage: 'ubuntu-20.04'
vmImage: 'ubuntu-24.04'
steps:
- template: ci/azure-pipeline-generic.yml
- job: Linux_ARM
Expand All @@ -57,7 +57,7 @@ jobs:
configGraphicsOpenGL: 'off'
configGraphicsEGL: 'off'
pool:
vmImage: 'ubuntu-20.04'
vmImage: 'ubuntu-24.04'
steps:
- template: ci/azure-pipeline-generic.yml
- job: Linux_ARM64
Expand All @@ -80,7 +80,7 @@ jobs:
configGraphicsOpenGL: 'off'
configGraphicsEGL: 'off'
pool:
vmImage: 'ubuntu-20.04'
vmImage: 'ubuntu-24.04'
steps:
- template: ci/azure-pipeline-generic.yml
- job: MacOS
Expand Down Expand Up @@ -136,6 +136,6 @@ jobs:
configGraphicsOpenGL: 'on'
configGraphicsEGL: 'off'
pool:
vmImage: 'windows-2019'
vmImage: 'windows-2025'
steps:
- template: ci/azure-pipeline-generic.yml
2 changes: 1 addition & 1 deletion ci/azure-pipeline-generic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ steps:
sudo make -C lcov-1.15/ install

# Update link to gcov
sudo ln -sf /usr/bin/gcov-9 /usr/bin/gcov
sudo ln -sf /usr/bin/gcov-13 /usr/bin/gcov
gcov --version

# Install gcovr
Expand Down
2 changes: 1 addition & 1 deletion src/benchmarks/vcl.core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ message(STATUS "Configuring 'vcl_core_benchmarks'")

CPMAddPackage(
GITHUB_REPOSITORY foonathan/memory
VERSION 0.7-3
VERSION 0.7-4
OPTIONS
"FOONATHAN_MEMORY_BUILD_EXAMPLES NO"
"FOONATHAN_MEMORY_BUILD_TESTS NO"
Expand Down
2 changes: 1 addition & 1 deletion src/externals/eigen
Submodule eigen updated from 314739 to 549bf8
2 changes: 1 addition & 1 deletion src/libs/vcl.graphics/vcl/graphics/camera.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ namespace Vcl { namespace Graphics {

void Camera::encloseInFrustum(const Eigen::Vector3f& center, const Eigen::Vector3f& dir_to_camera, float radius, const Eigen::Vector3f& up)
{
assert(radius > 0.0f);
VclRequire(radius > 0., "Radius is greater than zero");

setPosition(center + dir_to_camera.normalized() * 2.0f * 1.05f * radius);
setTarget(center);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ namespace Vcl { namespace Graphics { namespace Runtime { namespace D3D12 {
_targetStates = toD3DResourceState(usage());
}

_currentStates = init_data ? D3D12_RESOURCE_STATE_COPY_DEST : buffer_usage;
_currentStates = D3D12_RESOURCE_STATE_COMMON;

ID3D12Device* d3d12_dev = device->nativeDevice();
D3D12_RESOURCE_FLAGS flags = D3D12_RESOURCE_FLAG_NONE;
Expand All @@ -120,6 +120,13 @@ namespace Vcl { namespace Graphics { namespace Runtime { namespace D3D12 {

if (init_data)
{
CD3DX12_RESOURCE_BARRIER barrier = CD3DX12_RESOURCE_BARRIER::Transition(
_resource.Get(),
D3D12_RESOURCE_STATE_COMMON,
D3D12_RESOURCE_STATE_COPY_DEST);
cmd_queue->ResourceBarrier(1, &barrier);
_currentStates = D3D12_RESOURCE_STATE_COPY_DEST;

const auto upload_heap_props = CD3DX12_HEAP_PROPERTIES(D3D12_HEAP_TYPE_UPLOAD);
const auto upload_buffer_desc = CD3DX12_RESOURCE_DESC::Buffer(desc.SizeInBytes);
VCL_DIRECT3D_SAFE_CALL(d3d12_dev->CreateCommittedResource(
Expand All @@ -137,6 +144,15 @@ namespace Vcl { namespace Graphics { namespace Runtime { namespace D3D12 {

UpdateSubresources(cmd_queue, _resource.Get(), _uploadResource.Get(), 0, 0, 1, &subresource_data);
}

if (cmd_queue && _currentStates != buffer_usage)
{
CD3DX12_RESOURCE_BARRIER barrier = CD3DX12_RESOURCE_BARRIER::Transition(
_resource.Get(),
_currentStates,
buffer_usage);
cmd_queue->ResourceBarrier(1, &barrier);
}
}

Buffer::~Buffer()
Expand Down