mirror of
https://git.eden-emu.dev/eden-emu/eden.git
synced 2026-08-17 13:56:06 +00:00
[cmake] enable clang-cl and WoA builds (#348)
Compilation and CMake fixes for both Windows on ARM and clang-cl, meaning Windows can now be built on both MSVC and clang on both amd64 and aarch64. Compiling on clang is *dramatically* faster so this should be useful for CI. Co-authored-by: crueter <crueter@eden-emu.dev> Co-authored-by: crueter <crueter@crueter.xyz> Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/348 Reviewed-by: CamilleLaVey <camillelavey99@gmail.com> Reviewed-by: crueter <crueter@eden-emu.dev> Co-authored-by: lizzie <lizzie@eden-emu.dev> Co-committed-by: lizzie <lizzie@eden-emu.dev>
This commit is contained in:
@@ -327,8 +327,8 @@ template <u32 GOB_EXTENT>
|
||||
}
|
||||
const SubresourceExtent resources = new_info.resources;
|
||||
return SubresourceExtent{
|
||||
.levels = std::max(resources.levels, info.resources.levels),
|
||||
.layers = std::max(resources.layers, info.resources.layers),
|
||||
.levels = (std::max)(resources.levels, info.resources.levels),
|
||||
.layers = (std::max)(resources.layers, info.resources.layers),
|
||||
};
|
||||
}
|
||||
|
||||
@@ -354,7 +354,7 @@ template <u32 GOB_EXTENT>
|
||||
return std::nullopt;
|
||||
}
|
||||
return SubresourceExtent{
|
||||
.levels = std::max(new_info.resources.levels, info.resources.levels + base.level),
|
||||
.levels = (std::max)(new_info.resources.levels, info.resources.levels + base.level),
|
||||
.layers = 1,
|
||||
};
|
||||
}
|
||||
@@ -388,8 +388,8 @@ template <u32 GOB_EXTENT>
|
||||
return std::nullopt;
|
||||
}
|
||||
return SubresourceExtent{
|
||||
.levels = std::max(new_info.resources.levels, info.resources.levels + base.level),
|
||||
.layers = std::max(new_info.resources.layers, info.resources.layers + base.layer),
|
||||
.levels = (std::max)(new_info.resources.levels, info.resources.levels + base.level),
|
||||
.layers = (std::max)(new_info.resources.layers, info.resources.layers + base.layer),
|
||||
};
|
||||
}
|
||||
|
||||
@@ -439,14 +439,14 @@ template <u32 GOB_EXTENT>
|
||||
}
|
||||
layers = 1;
|
||||
} else {
|
||||
layers = std::max(resources.layers, info.resources.layers + base->layer);
|
||||
layers = (std::max)(resources.layers, info.resources.layers + base->layer);
|
||||
}
|
||||
return OverlapResult{
|
||||
.gpu_addr = overlap.gpu_addr,
|
||||
.cpu_addr = overlap.cpu_addr,
|
||||
.resources =
|
||||
{
|
||||
.levels = std::max(resources.levels + base->level, info.resources.levels),
|
||||
.levels = (std::max)(resources.levels + base->level, info.resources.levels),
|
||||
.layers = layers,
|
||||
},
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user