Skip to content
This repository was archived by the owner on Nov 1, 2020. It is now read-only.
Open
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 deps/fmt
Submodule fmt updated 53 files
+11 −20 .travis.yml
+9 −17 CMakeLists.txt
+11 −11 ChangeLog.rst
+16 −27 README.rst
+1 −1 doc/_templates/layout.html
+24 −26 doc/api.rst
+2 −1 doc/build.py
+3 −5 doc/index.rst
+1 −1 doc/syntax.rst
+11 −4 doc/usage.rst
+68 −140 include/fmt/chrono.h
+29 −19 include/fmt/color.h
+579 −471 include/fmt/core.h
+66 −114 include/fmt/format-inl.h
+266 −340 include/fmt/format.h
+22 −23 include/fmt/locale.h
+26 −18 include/fmt/ostream.h
+5 −5 include/fmt/posix.h
+41 −44 include/fmt/prepare.h
+112 −63 include/fmt/printf.h
+16 −12 include/fmt/ranges.h
+1 −5 include/fmt/time.h
+159 −195 include/format
+27 −11 src/format.cc
+2 −2 src/posix.cc
+0 −19 support/Vagrantfile
+8 −11 support/appveyor-build.py
+5 −12 support/appveyor.yml
+27 −11 support/cmake/cxx14.cmake
+11 −0 support/cmake/run-cmake.bat
+0 −1 support/manage.py
+1 −1 support/rtd/index.rst
+3 −3 support/rtd/theme/layout.html
+6 −17 test/CMakeLists.txt
+3 −48 test/chrono-test.cc
+62 −95 test/core-test.cc
+3 −8 test/custom-formatter-test.cc
+11 −30 test/format-impl-test.cc
+92 −78 test/format-test.cc
+0 −2 test/grisu-test.cc
+6 −8 test/gtest-extra-test.cc
+1 −1 test/gtest-extra.h
+2 −2 test/mock-allocator.h
+18 −32 test/ostream-test.cc
+9 −16 test/posix-mock-test.cc
+11 −11 test/posix-test.cc
+11 −63 test/prepare-test.cc
+24 −61 test/printf-test.cc
+2 −2 test/ranges-test.cc
+0 −114 test/scan-test.cc
+0 −233 test/scan.h
+0 −156 test/std-format-test.cc
+1 −1 test/util.h
4 changes: 2 additions & 2 deletions src/d3d12/d3d12_material_pool.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@

namespace wr
{
D3D12MaterialPool::D3D12MaterialPool(D3D12RenderSystem & render_system) :
D3D12MaterialPool::D3D12MaterialPool(D3D12RenderSystem & render_system, size_t num_materials) :
m_render_system(render_system)
{
m_constant_buffer_pool = m_render_system.CreateConstantBufferPool(1_mb);
m_constant_buffer_pool = m_render_system.CreateConstantBufferPool(num_materials * sizeof(Material::MaterialData) * d3d12::settings::num_back_buffers);
}

D3D12MaterialPool::~D3D12MaterialPool()
Expand Down
2 changes: 1 addition & 1 deletion src/d3d12/d3d12_material_pool.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ namespace wr
class D3D12MaterialPool : public MaterialPool
{
public:
explicit D3D12MaterialPool(D3D12RenderSystem& render_system);
explicit D3D12MaterialPool(D3D12RenderSystem& render_system, size_t material_count);
~D3D12MaterialPool() final;

void Evict() final;
Expand Down
4 changes: 2 additions & 2 deletions src/d3d12/d3d12_renderer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -317,9 +317,9 @@ namespace wr
return pool;
}

std::shared_ptr<MaterialPool> D3D12RenderSystem::CreateMaterialPool(std::size_t size_in_bytes)
std::shared_ptr<MaterialPool> D3D12RenderSystem::CreateMaterialPool(std::size_t material_count)
{
return std::make_shared<D3D12MaterialPool>(*this);
return std::make_shared<D3D12MaterialPool>(*this, material_count);
}

std::shared_ptr<ModelPool> D3D12RenderSystem::CreateModelPool(std::size_t vertex_buffer_pool_size_in_bytes, std::size_t index_buffer_pool_size_in_bytes)
Expand Down
2 changes: 1 addition & 1 deletion src/d3d12/d3d12_renderer.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ namespace wr
void Resize(std::uint32_t width, std::uint32_t height);

std::shared_ptr<TexturePool> CreateTexturePool();
std::shared_ptr<MaterialPool> CreateMaterialPool(std::size_t size_in_bytes);
std::shared_ptr<MaterialPool> CreateMaterialPool(std::size_t material_count);
std::shared_ptr<ModelPool> CreateModelPool(std::size_t vertex_buffer_pool_size_in_bytes, std::size_t index_buffer_pool_size_in_bytes);
std::shared_ptr<ConstantBufferPool> CreateConstantBufferPool(std::size_t size_in_bytes);
std::shared_ptr<StructuredBufferPool> CreateStructuredBufferPool(std::size_t size_in_bytes);
Expand Down