diff options
| author | jsmall-nvidia <jsmall@nvidia.com> | 2022-02-10 13:57:59 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-10 13:57:59 -0500 |
| commit | 15f07d14b5f048dc355536cbdf5cf9c10291b13b (patch) | |
| tree | a60f6b7929d6cf1301c8b0dff57f675df8ee5339 /tools/gfx/cpu/render-cpu.cpp | |
| parent | b8982fcf43b86c1e39dcc3dd19bff2821633eda6 (diff) | |
Fix MacOSX build issues (#2124)
* #include an absolute path didn't work - because paths were taken to always be relative.
* Small fixes.
Added compiler crash with generic defined in a function.
Added enum-flags test that works (by limiting backing type to int), and using __EnumType constraint.
* Add comment about crash.
* Disable crashing test.
* Fixes to make compile on OSX.
* Add github build for OSX.
* Make premake generator a utility.
* Fix osx compilation issue.
* More fixes for OSX build.
* OSX fix due to ambiguity around size_t and integer types.
* Disable xlib on build on osx.
* Use 'prebuildcommands' to make prebuild make utility projects do something.
* Small fixes for premake so utility works on linux/osx.
* Another hack to try and make generators run when 'utility'
* Fix typo in macos.yml.
* Revert premake to old style, and disable stdlib embedding on OSX.
Diffstat (limited to 'tools/gfx/cpu/render-cpu.cpp')
| -rw-r--r-- | tools/gfx/cpu/render-cpu.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/gfx/cpu/render-cpu.cpp b/tools/gfx/cpu/render-cpu.cpp index a20ed3ebe..d17cf6ea8 100644 --- a/tools/gfx/cpu/render-cpu.cpp +++ b/tools/gfx/cpu/render-cpu.cpp @@ -873,7 +873,7 @@ public: virtual SLANG_NO_THROW Result SLANG_MCALL setData(ShaderOffset const& offset, void const* data, size_t size) override { - size = Math::Min(size, (size_t)m_data.getCount() - offset.uniformOffset); + size = Math::Min(size, size_t(m_data.getCount() - offset.uniformOffset)); memcpy((char*)m_data.getBuffer() + offset.uniformOffset, data, size); return SLANG_OK; } |