Vulkan
This commit is contained in:
parent
1bb4b8fa0d
commit
62663dc8e1
|
|
@ -427,7 +427,7 @@ namespace Nz
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename F, typename... Args>
|
template<typename F, typename... Args>
|
||||||
bool VirtualDirectory::CallbackReturn(F&& callback, Args&& ...args)
|
bool VirtualDirectory::CallbackReturn(F&& callback, Args&&... args)
|
||||||
{
|
{
|
||||||
using Ret = decltype(callback(std::forward<Args>(args)...));
|
using Ret = decltype(callback(std::forward<Args>(args)...));
|
||||||
if constexpr (std::is_void_v<Ret>)
|
if constexpr (std::is_void_v<Ret>)
|
||||||
|
|
|
||||||
|
|
@ -81,7 +81,7 @@ namespace Nz
|
||||||
{
|
{
|
||||||
nzsl::Unserializer unserializer(source, sourceSize);
|
nzsl::Unserializer unserializer(source, sourceSize);
|
||||||
auto shader = nzsl::Ast::UnserializeShader(unserializer);
|
auto shader = nzsl::Ast::UnserializeShader(unserializer);
|
||||||
return Create(device, shaderStages, *shader, {});
|
return Create(device, shaderStages, *shader, states);
|
||||||
}
|
}
|
||||||
|
|
||||||
case ShaderLanguage::NazaraShader:
|
case ShaderLanguage::NazaraShader:
|
||||||
|
|
|
||||||
|
|
@ -32,8 +32,8 @@ namespace Nz
|
||||||
{
|
{
|
||||||
BaseWidget::Layout();
|
BaseWidget::Layout();
|
||||||
|
|
||||||
std::size_t axis;
|
std::size_t axis = 0;
|
||||||
bool reversed;
|
bool reversed = false;
|
||||||
|
|
||||||
switch (m_orientation)
|
switch (m_orientation)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -238,7 +238,7 @@ namespace Nz
|
||||||
|
|
||||||
std::unique_ptr<ScrollAreaWidgetStyle> DefaultWidgetTheme::CreateStyle(ScrollAreaWidget* scrollAreaWidget) const
|
std::unique_ptr<ScrollAreaWidgetStyle> DefaultWidgetTheme::CreateStyle(ScrollAreaWidget* scrollAreaWidget) const
|
||||||
{
|
{
|
||||||
return nullptr; //< TODO
|
return std::make_unique<SimpleScrollAreaWidgetStyle>(scrollAreaWidget);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::unique_ptr<ScrollbarWidgetStyle> DefaultWidgetTheme::CreateStyle(ScrollbarWidget* scrollBarWidget) const
|
std::unique_ptr<ScrollbarWidgetStyle> DefaultWidgetTheme::CreateStyle(ScrollbarWidget* scrollBarWidget) const
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue