Merge pull request #3909 from phire/Adapter_name_for_opengl

analytics: Report OpenGL's adapter name too.

3 files changed, 10 insertions, 0 deletions

diff --git a/Source/Core/Core/Analytics.cpp b/Source/Core/Core/Analytics.cpp
index 0f077ca27f..5339b21d22 100644
--- a/Source/Core/Core/Analytics.cpp
+++ b/Source/Core/Core/Analytics.cpp
@@ -219,6 +219,10 @@ void DolphinAnalytics::MakePerGameBuilder()
 	{
 		builder.AddData("gpu-adapter", g_Config.backend_info.Adapters[g_Config.iAdapter]);
 	}
+	else if (!g_Config.backend_info.AdapterName.empty())
+	{
+		builder.AddData("gpu-adapter", g_Config.backend_info.AdapterName);
+	}
 	builder.AddData("gpu-has-exclusive-fullscreen", g_Config.backend_info.bSupportsExclusiveFullscreen);
 	builder.AddData("gpu-has-dual-source-blend", g_Config.backend_info.bSupportsDualSourceBlend);
 	builder.AddData("gpu-has-primitive-restart", g_Config.backend_info.bSupportsPrimitiveRestart);
diff --git a/Source/Core/VideoBackends/OGL/Render.cpp b/Source/Core/VideoBackends/OGL/Render.cpp
index d5f2bac843..73fc32d7ea 100644
--- a/Source/Core/VideoBackends/OGL/Render.cpp
+++ b/Source/Core/VideoBackends/OGL/Render.cpp
@@ -404,6 +404,9 @@ Renderer::Renderer()
 		}
 	}
 
+	// Copy the GPU name to g_Config, so Analytics can see it.
+	g_Config.backend_info.AdapterName = g_ogl_config.gl_renderer;
+
 	g_Config.backend_info.bSupportsDualSourceBlend = GLExtensions::Supports("GL_ARB_blend_func_extended") ||
 	                                                 GLExtensions::Supports("GL_EXT_blend_func_extended");
 	g_Config.backend_info.bSupportsPrimitiveRestart = !DriverDetails::HasBug(DriverDetails::BUG_PRIMITIVERESTART) &&
diff --git a/Source/Core/VideoCommon/VideoConfig.h b/Source/Core/VideoCommon/VideoConfig.h
index bc0250ab2f..fdb96d823c 100644
--- a/Source/Core/VideoCommon/VideoConfig.h
+++ b/Source/Core/VideoCommon/VideoConfig.h
@@ -156,6 +156,9 @@ struct VideoConfig final
 		std::vector<std::string> PPShaders; // post-processing shaders
 		std::vector<std::string> AnaglyphShaders; // anaglyph shaders
 
+		// TODO: merge AdapterName and Adapters array
+		std::string AdapterName; // for OpenGL
+
 		bool bSupportsExclusiveFullscreen;
 		bool bSupportsDualSourceBlend;
 		bool bSupportsPrimitiveRestart;