mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2025-02-18 06:18:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Replace std::strcmp by std::string_view::operator==

Browse Source 
clang-format validation pass

Remove unecessary cstring include
This commit is contained in:
Thibaut PONCHON 2023-01-21 18:39:29 -05:00 committed by Chris Thrasher
parent 401615f5e6
commit 642d981acf
5 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/vulkan/Vulkan.cpp
View File

@ -470,11 +470,11 @@ public:
// -- VK_LAYER_GOOGLE_unique_objects // -- VK_LAYER_GOOGLE_unique_objects
// These layers perform error checking and warn about bad or sub-optimal Vulkan API usage // These layers perform error checking and warn about bad or sub-optimal Vulkan API usage
// VK_LAYER_LUNARG_monitor appends an FPS counter to the window title // VK_LAYER_LUNARG_monitor appends an FPS counter to the window title
if (!std::strcmp(layer.layerName, "VK_LAYER_LUNARG_standard_validation")) if (std::string_view(layer.layerName) == "VK_LAYER_LUNARG_standard_validation")
{ {
validationLayers.push_back("VK_LAYER_LUNARG_standard_validation"); validationLayers.push_back("VK_LAYER_LUNARG_standard_validation");
} }
else if (!std::strcmp(layer.layerName, "VK_LAYER_LUNARG_monitor")) else if (std::string_view(layer.layerName) == "VK_LAYER_LUNARG_monitor")
{ {
validationLayers.push_back("VK_LAYER_LUNARG_monitor"); validationLayers.push_back("VK_LAYER_LUNARG_monitor");
} }
@ -611,7 +611,7 @@ public:
for (VkExtensionProperties& extension : extensions) for (VkExtensionProperties& extension : extensions)
{ {
if (!std::strcmp(extension.extensionName, VK_KHR_SWAPCHAIN_EXTENSION_NAME)) if (std::string_view(extension.extensionName) == VK_KHR_SWAPCHAIN_EXTENSION_NAME)
{ {
supportsSwapchain = true; supportsSwapchain = true;
break; break;

2
src/SFML/Window/DRM/DRMContext.cpp
View File

@ -365,7 +365,7 @@ int initDrm(sf::priv::Drm& drm, const char* device, const char* modeStr, unsigne
{ {
drmModeModeInfoPtr currentMode = &connector->modes[i]; drmModeModeInfoPtr currentMode = &connector->modes[i];
if (std::strcmp(currentMode->name, modeStr) == 0) if (std::string_view(currentMode->name) == modeStr)
{ {
if (vrefresh == 0 || currentMode->vrefresh == vrefresh) if (vrefresh == 0 || currentMode->vrefresh == vrefresh)
{ {

2
src/SFML/Window/GlContext.cpp
View File

@ -932,7 +932,7 @@ void GlContext::checkSettings(const ContextSettings& requestedSettings) const
if (vendorName && rendererName) if (vendorName && rendererName)
{ {
if ((std::strcmp(vendorName, "Microsoft Corporation") == 0) && (std::strcmp(rendererName, "GDI Generic") == 0)) if (std::string_view(vendorName) == "Microsoft Corporation" && std::string_view(rendererName) == "GDI Generic")
{ {
err() << "Warning: Detected \"Microsoft Corporation GDI Generic\" OpenGL implementation" << '\n' err() << "Warning: Detected \"Microsoft Corporation GDI Generic\" OpenGL implementation" << '\n'
<< "The current OpenGL implementation is not hardware-accelerated" << std::endl; << "The current OpenGL implementation is not hardware-accelerated" << std::endl;

5
src/SFML/Window/Unix/VulkanImplX11.cpp
View File

@ -28,7 +28,6 @@
#include <SFML/Window/Unix/Display.hpp> #include <SFML/Window/Unix/Display.hpp>
#include <SFML/Window/Unix/VulkanImplX11.hpp> #include <SFML/Window/Unix/VulkanImplX11.hpp>
#include <cstring>
#include <dlfcn.h> #include <dlfcn.h>
#include <map> #include <map>
#include <string> #include <string>
@ -139,11 +138,11 @@ bool VulkanImplX11::isAvailable(bool requireGraphics)
for (const VkExtensionProperties& properties : extensionProperties) for (const VkExtensionProperties& properties : extensionProperties)
{ {
if (!std::strcmp(properties.extensionName, VK_KHR_SURFACE_EXTENSION_NAME)) if (std::string_view(properties.extensionName) == VK_KHR_SURFACE_EXTENSION_NAME)
{ {
hasVkKhrSurface = true; hasVkKhrSurface = true;
} }
else if (!std::strcmp(properties.extensionName, VK_KHR_XLIB_SURFACE_EXTENSION_NAME)) else if (std::string_view(properties.extensionName) == VK_KHR_XLIB_SURFACE_EXTENSION_NAME)
{ {
hasVkKhrPlatformSurface = true; hasVkKhrPlatformSurface = true;
} }

5
src/SFML/Window/Win32/VulkanImplWin32.cpp
View File

@ -28,7 +28,6 @@
#include <SFML/System/Win32/WindowsHeader.hpp> #include <SFML/System/Win32/WindowsHeader.hpp>
#include <SFML/Window/Win32/VulkanImplWin32.hpp> #include <SFML/Window/Win32/VulkanImplWin32.hpp>
#include <cstring>
#include <map> #include <map>
#include <string> #include <string>
#define VK_USE_PLATFORM_WIN32_KHR #define VK_USE_PLATFORM_WIN32_KHR
@ -138,11 +137,11 @@ bool VulkanImplWin32::isAvailable(bool requireGraphics)
for (const VkExtensionProperties& properties : extensionProperties) for (const VkExtensionProperties& properties : extensionProperties)
{ {
if (!std::strcmp(properties.extensionName, VK_KHR_SURFACE_EXTENSION_NAME)) if (std::string_view(properties.extensionName) == VK_KHR_SURFACE_EXTENSION_NAME)
{ {
hasVkKhrSurface = true; hasVkKhrSurface = true;
} }
else if (!std::strcmp(properties.extensionName, VK_KHR_WIN32_SURFACE_EXTENSION_NAME)) else if (std::string_view(properties.extensionName) == VK_KHR_WIN32_SURFACE_EXTENSION_NAME)
{ {
hasVkKhrPlatformSurface = true; hasVkKhrPlatformSurface = true;
} }