Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

std::vector -> std::array for constant #14154

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

std::vector -> std::array for constant #14154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions drape/support_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
#include "std/target_os.hpp"

#include <algorithm>
#include <array>
#include <string>
#include <vector>

namespace dp
{
Expand Down Expand Up @@ -45,7 +45,7 @@ void SupportManager::Init(ref_ptr<GraphicsContext> context)

if (m_rendererName.find("Adreno") != std::string::npos)
{
std::vector<std::string> const models = { "200", "203", "205", "220", "225" };
std::array<std::string, 5> const models = { "200", "203", "205", "220", "225" };
for (auto const & model : models)
{
if (m_rendererName.find(model) != std::string::npos)
Expand Down Expand Up @@ -119,14 +119,14 @@ bool SupportManager::IsVulkanForbidden() const
bool SupportManager::IsVulkanForbidden(std::string const & deviceName,
Version apiVersion, Version driverVersion) const
{
static std::vector<std::string> const kBannedDevices = {"PowerVR Rogue GE8100",
"PowerVR Rogue GE8300"};
static std::array<std::string ,2> const kBannedDevices = {"PowerVR Rogue GE8100",
"PowerVR Rogue GE8300"};

// On these configurations we've detected fatal driver-specific Vulkan errors.
static std::vector<Configuration> const kBannedConfigurations = {
{"Adreno (TM) 506", {1, 0, 31}, {42, 264, 975}},
{"Adreno (TM) 506", {1, 1, 66}, {512, 313, 0}},
{"Adreno (TM) 530", {1, 1, 66}, {512, 313, 0}},
static std::array<Configuration, 3> const kBannedConfigurations = {
Configuration{"Adreno (TM) 506", {1, 0, 31}, {42, 264, 975}},
Configuration{"Adreno (TM) 506", {1, 1, 66}, {512, 313, 0}},
Configuration{"Adreno (TM) 530", {1, 1, 66}, {512, 313, 0}}
};

for (auto const & d : kBannedDevices)
Expand Down Expand Up @@ -156,7 +156,7 @@ bool SupportManager::IsVulkanTexturePartialUpdateBuggy(int sdkVersion,
return true;

// For these configurations partial updates of texture clears whole texture except part updated
static std::vector<Configuration> const kBadConfigurations = {
static std::array<Configuration, 1> const kBadConfigurations = {
{"Mali-G76", {1, 1, 97}, {18, 0, 0}},
};

Expand Down
3 changes: 2 additions & 1 deletion drape/vulkan/vulkan_pipeline.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include "base/assert.hpp"
#include "base/file_name_utils.hpp"

#include <array>
#include <string>
#include <utility>
#include <vector>
Expand Down Expand Up @@ -326,7 +327,7 @@ VkPipeline VulkanPipeline::GetPipeline(VkDevice device, PipelineKey const & key)
multisampleStateCreateInfo.rasterizationSamples = VK_SAMPLE_COUNT_1_BIT;

// Dynamic.
static std::vector<VkDynamicState> dynamicState = {
static std::array<VkDynamicState, 4> dynamicState = {
VK_DYNAMIC_STATE_VIEWPORT, VK_DYNAMIC_STATE_SCISSOR, VK_DYNAMIC_STATE_LINE_WIDTH,
VK_DYNAMIC_STATE_STENCIL_REFERENCE};
VkPipelineDynamicStateCreateInfo dynamicStateCreateInfo = {};
Expand Down
13 changes: 7 additions & 6 deletions drape_frontend/frontend_renderer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
#include "std/target_os.hpp"

#include <algorithm>
#include <array>
#include <chrono>
#include <cmath>
#include <functional>
Expand Down Expand Up @@ -1885,13 +1886,13 @@ void FrontendRenderer::RenderFrame()

void FrontendRenderer::BuildOverlayTree(ScreenBase const & modelView)
{
static std::vector<DepthLayer> layers = {DepthLayer::OverlayLayer,
DepthLayer::LocalAdsMarkLayer,
DepthLayer::NavigationLayer,
DepthLayer::RoutingBottomMarkLayer,
DepthLayer::RoutingMarkLayer};
std::array<DepthLayer, 5> const layers = {DepthLayer::OverlayLayer,
DepthLayer::LocalAdsMarkLayer,
DepthLayer::NavigationLayer,
DepthLayer::RoutingBottomMarkLayer,
DepthLayer::RoutingMarkLayer};
BeginUpdateOverlayTree(modelView);
for (auto const & layerId : layers)
for (auto const layerId : layers)
{
RenderLayer & overlay = m_layers[static_cast<size_t>(layerId)];
overlay.Sort(make_ref(m_overlayTree));
Expand Down
7 changes: 4 additions & 3 deletions drape_frontend/my_position_controller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include "3party/Alohalytics/src/alohalytics.h"

#include <algorithm>
#include <array>
#include <chrono>
#include <string>
#include <vector>
Expand Down Expand Up @@ -74,7 +75,7 @@ int GetZoomLevel(ScreenBase const & screen, m2::PointD const & position, double
double CalculateZoomBySpeed(double speed, bool isPerspectiveAllowed)
{
using TSpeedScale = std::pair<double, double>;
static std::vector<TSpeedScale> const scales3d = {
static std::array<TSpeedScale, 6> const scales3d = {
std::make_pair(20.0, 0.25),
std::make_pair(40.0, 0.75),
std::make_pair(60.0, 1.5),
Expand All @@ -83,7 +84,7 @@ double CalculateZoomBySpeed(double speed, bool isPerspectiveAllowed)
std::make_pair(95.0, 6.0),
};

static std::vector<TSpeedScale> const scales2d = {
static std::array<TSpeedScale, 6> const scales2d = {
std::make_pair(20.0, 0.7),
std::make_pair(40.0, 1.25),
std::make_pair(60.0, 2.25),
Expand All @@ -92,7 +93,7 @@ double CalculateZoomBySpeed(double speed, bool isPerspectiveAllowed)
std::make_pair(95.0, 6.0),
};

std::vector<TSpeedScale> const & scales = isPerspectiveAllowed ? scales3d : scales2d;
std::array<TSpeedScale, 6> const & scales = isPerspectiveAllowed ? scales3d : scales2d;

double const kDefaultSpeed = 80.0;
if (speed < 0.0)
Expand Down
7 changes: 4 additions & 3 deletions drape_frontend/rule_drawer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
#include "base/string_utils.hpp"
#endif

#include <array>
#include <functional>
#include <utility>
#include <vector>
Expand All @@ -41,7 +42,7 @@ namespace
{
// The first zoom level in kAverageSegmentsCount.
int constexpr kFirstZoomInAverageSegments = 10;
std::vector<size_t> const kAverageSegmentsCount =
std::array<size_t, 10> const kAverageSegmentsCount =
{
// 10 11 12 13 14 15 16 17 18 19
10000, 5000, 10000, 5000, 2500, 5000, 2000, 1000, 500, 500
Expand Down Expand Up @@ -115,8 +116,8 @@ void ExtractTrafficGeometry(FeatureType const & f, df::RoadClass const & roadCla
if (!oneWay)
twoWayOffset = pixelToGlobalScale * df::TrafficRenderer::GetTwoWayOffset(roadClass, zoomLevel);

static std::vector<uint8_t> directions = {traffic::TrafficInfo::RoadSegmentId::kForwardDirection,
traffic::TrafficInfo::RoadSegmentId::kReverseDirection};
static std::array<uint8_t, 2> const directions = {traffic::TrafficInfo::RoadSegmentId::kForwardDirection,
traffic::TrafficInfo::RoadSegmentId::kReverseDirection};
auto & segments = geometry[f.GetID().m_mwmId];

int const index = zoomLevel - kFirstZoomInAverageSegments;
Expand Down
7 changes: 4 additions & 3 deletions drape_frontend/traffic_generator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include "base/logging.hpp"

#include <algorithm>
#include <array>
#include <memory>

using namespace std::placeholders;
Expand Down Expand Up @@ -144,7 +145,7 @@ void TrafficGenerator::GenerateSegmentsGeometry(ref_ptr<dp::GraphicsContext> con
traffic::TrafficInfo::Coloring const & coloring,
ref_ptr<dp::TextureManager> texturesMgr)
{
static std::vector<int> const kGenerateCirclesZoomLevel = {14, 14, 16};
static std::array<int, 3> const kGenerateCirclesZoomLevel = {14, 14, 16};

ASSERT(m_colorsCacheValid, ());
auto const colorTexture = m_colorsCache[static_cast<size_t>(traffic::SpeedGroup::G0)].GetTexture();
Expand All @@ -167,7 +168,7 @@ void TrafficGenerator::GenerateSegmentsGeometry(ref_ptr<dp::GraphicsContext> con
isLeftHand = (regionData.Get(feature::RegionData::RD_DRIVING) == "l");
}

static std::vector<float> const kRoadClassDepths = {30.0f, 20.0f, 10.0f};
static std::array<float, 3> const kRoadClassDepths = {30.0f, 20.0f, 10.0f};

for (auto const & geomPair : geometry)
{
Expand Down Expand Up @@ -237,7 +238,7 @@ void TrafficGenerator::FlushSegmentsGeometry(ref_ptr<dp::GraphicsContext> contex
{
FillColorsCache(textures);

static std::vector<RoadClass> const kRoadClasses = {RoadClass::Class0, RoadClass::Class1,
static std::array<RoadClass, 3> const kRoadClasses = {RoadClass::Class0, RoadClass::Class1,
RoadClass::Class2};
for (auto const & g : geom)
{
Expand Down
3 changes: 2 additions & 1 deletion routing/routing_quality/routing_quality_tool/utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include "base/file_name_utils.hpp"
#include "base/logging.hpp"

#include <array>
#include <iomanip>
#include <utility>

Expand Down Expand Up @@ -70,7 +71,7 @@ void SaveKmlFileDataTo(RoutesBuilder::Result const & mapsmeResult,
AnotherResult const & apiResult,
std::string const & kmlFile)
{
static std::vector<uint32_t> const kColors = {
static std::array<uint32_t, 5> const kColors = {
0xff0000ff, // Red
0x0000ffff, // Blue
0x00ff00ff, // Green
Expand Down