Minor clean up

hrydgard · Jun 14, 2020 · c82265b · c82265b
1 parent 16864cc
commit c82265b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/Core/Config.cpp b/Core/Config.cpp
@@ -1202,8 +1202,8 @@ void Config::Load(const char *iniFileName, const char *controllerIniFilename) {
 
 	auto postShaderChain = iniFile.GetOrCreateSection("PostShaderList")->ToMap();
 	vPostShaderNames.clear();
-	for (auto it = postShaderChain.begin(), end = postShaderChain.end(); it != end; ++it) {
-		vPostShaderNames.push_back(it->second); // Push by order not number
+	for (auto it : postShaderChain) {
+		vPostShaderNames.push_back(it.second);
 	}
 	if (vPostShaderNames.empty())
 		vPostShaderNames.push_back("Off");
@@ -1624,8 +1624,8 @@ bool Config::loadGameConfig(const std::string &pGameId, const std::string &title
 
 	auto postShaderChain = iniFile.GetOrCreateSection("PostShaderList")->ToMap();
 	vPostShaderNames.clear();
-	for (auto it = postShaderChain.begin(), end = postShaderChain.end(); it != end; ++it) {
-		vPostShaderNames.push_back(it->second); // Push by order not number
+	for (auto it : postShaderChain) {
+		vPostShaderNames.push_back(it.second);
 	}
 	if (vPostShaderNames.empty())
 		vPostShaderNames.push_back("Off");
@@ -1662,8 +1662,8 @@ void Config::unloadGameConfig() {
 
 		auto postShaderChain = iniFile.GetOrCreateSection("PostShaderList")->ToMap();
 		vPostShaderNames.clear();
-		for (auto it = postShaderChain.begin(), end = postShaderChain.end(); it != end; ++it) {
-			vPostShaderNames.push_back(it->second); // Push by order not number
+		for (auto it : postShaderChain) {
+			vPostShaderNames.push_back(it.second);
 		}
 		if (vPostShaderNames.empty())
 			vPostShaderNames.push_back("Off");

diff --git a/Core/Config.h b/Core/Config.h
@@ -204,7 +204,7 @@ struct Config {
 	bool bFragmentTestCache;
 	int iSplineBezierQuality; // 0 = low , 1 = Intermediate , 2 = High
 	bool bHardwareTessellation;
-	std::vector<std::string> vPostShaderNames; // Off for off or chain end.
+	std::vector<std::string> vPostShaderNames; // Off for chain end (only Off for no shader)
 	std::map<std::string, float> mPostShaderSetting;
 	bool bGfxDebugOutput;
 	bool bGfxDebugSplitSubmit;

diff --git a/GPU/Common/PostShader.cpp b/GPU/Common/PostShader.cpp
@@ -188,10 +188,10 @@ std::vector<const ShaderInfo *> GetPostShaderChain(const std::string &name) {
 
 std::vector<const ShaderInfo *> GetFullPostShadersChain(const std::vector<std::string> &names) {
 	std::vector<const ShaderInfo *> fullChain;
-	for (int i = 0; i < names.size(); ++i) {
-		if (names[i] == "Off")
+	for (auto shaderName : names) {
+		if (shaderName == "Off")
 			break;
-		auto shaderChain = GetPostShaderChain(names[i]);
+		auto shaderChain = GetPostShaderChain(shaderName);
 		fullChain.insert(fullChain.end(), shaderChain.begin(), shaderChain.end());
 	}
 	return fullChain;

diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp
@@ -289,7 +289,7 @@ void GameSettingsScreen::CreateViews() {
 
 	std::vector<std::string> alreadyAddedShader;
 	for (int i = 0; i < g_Config.vPostShaderNames.size() && i < ARRAY_SIZE(shaderNames_); ++i) {
-		// Vector pointer get invalidated on resize, cache them here
+		// Vector pointer get invalidated on resize, cache name to have always a valid reference for drawing
 		shaderNames_[i] = g_Config.vPostShaderNames[i];
 		postProcChoice_ = graphicsSettings->Add(new ChoiceWithValueDisplay(&shaderNames_[i], StringFromFormat("%s #%d", gr->T("Postprocessing Shader"), i + 1), &PostShaderTranslateName));
 		postProcChoice_->OnClick.Add([=](EventParams &e) {