Scarfski/filament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix debug builds.

Browse Source
This commit is contained in:
Philip Rideout
2018-11-19 15:45:40 -08:00
parent 694eab703c
commit 0d476b9f6d
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
filament/src/driver/vulkan/VulkanDriver.cpp
View File

@@ -78,7 +78,7 @@ VulkanDriver::VulkanDriver(VulkanPlatform* platform,
for (const VkLayerProperties& layer : availableLayers) {
const utils::CString availableLayer(layer.layerName);
for (const auto& desired : DESIRED_LAYERS) {
if (availableLayer.compare(desired) == 0) {
if (availableLayer == desired) {
enabledLayers.push_back(desired.c_str());
}
}

10
libs/utils/include/utils/CString.h
View File

@@ -279,14 +279,10 @@ private:
return strncmp(data(), rhs.data(), size());
}
int compare(const StaticString& rhs) const noexcept {
size_type lhs_size = size();
size_type rhs_size = rhs.size();
if (lhs_size < rhs_size) return -1;
if (lhs_size > rhs_size) return 1;
return strncmp(data(), rhs.data(), size());
friend bool operator==(CString const& lhs, StaticString const& rhs) noexcept {
return (lhs.data() == rhs.data()) ||
((lhs.size() == rhs.size()) && !strncmp(lhs.data(), rhs.data(), lhs.size()));
}
friend bool operator==(CString const& lhs, CString const& rhs) noexcept {
return (lhs.data() == rhs.data()) ||
((lhs.size() == rhs.size()) && !strncmp(lhs.data(), rhs.data(), lhs.size()));