|
@@ -0,0 +1,54 @@
|
|
|
+From 44b30c116682968bacf8aec566fc9c193026ecc9 Mon Sep 17 00:00:00 2001
|
|
|
+From: Rudi Heitbaum <rudi@heitbaum.com>
|
|
|
+Date: Wed, 6 Jul 2022 22:48:35 +1000
|
|
|
+Subject: [PATCH] GLUtils: cast as char as formatting of non-void pointers
|
|
|
+ is disallowed
|
|
|
+
|
|
|
+Downloaded from upstream commit:
|
|
|
+https://github.com/xbmc/xbmc/commit/44b30c116682968bacf8aec566fc9c193026ecc9
|
|
|
+
|
|
|
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
|
|
+---
|
|
|
+ xbmc/utils/GLUtils.cpp | 10 +++++-----
|
|
|
+ 1 file changed, 5 insertions(+), 5 deletions(-)
|
|
|
+
|
|
|
+diff --git a/xbmc/utils/GLUtils.cpp b/xbmc/utils/GLUtils.cpp
|
|
|
+index 1ef804709f..c36dcf6a20 100644
|
|
|
+--- a/xbmc/utils/GLUtils.cpp
|
|
|
++++ b/xbmc/utils/GLUtils.cpp
|
|
|
+@@ -148,27 +148,27 @@ void _VerifyGLState(const char* szfile, const char* szfunction, int lineno)
|
|
|
+ void LogGraphicsInfo()
|
|
|
+ {
|
|
|
+ #if defined(HAS_GL) || defined(HAS_GLES)
|
|
|
+- const GLubyte *s;
|
|
|
++ const char* s;
|
|
|
+
|
|
|
+- s = glGetString(GL_VENDOR);
|
|
|
++ s = reinterpret_cast<const char*>(glGetString(GL_VENDOR));
|
|
|
+ if (s)
|
|
|
+ CLog::Log(LOGINFO, "GL_VENDOR = %s", s);
|
|
|
+ else
|
|
|
+ CLog::Log(LOGINFO, "GL_VENDOR = NULL");
|
|
|
+
|
|
|
+- s = glGetString(GL_RENDERER);
|
|
|
++ s = reinterpret_cast<const char*>(glGetString(GL_RENDERER));
|
|
|
+ if (s)
|
|
|
+ CLog::Log(LOGINFO, "GL_RENDERER = %s", s);
|
|
|
+ else
|
|
|
+ CLog::Log(LOGINFO, "GL_RENDERER = NULL");
|
|
|
+
|
|
|
+- s = glGetString(GL_VERSION);
|
|
|
++ s = reinterpret_cast<const char*>(glGetString(GL_VERSION));
|
|
|
+ if (s)
|
|
|
+ CLog::Log(LOGINFO, "GL_VERSION = %s", s);
|
|
|
+ else
|
|
|
+ CLog::Log(LOGINFO, "GL_VERSION = NULL");
|
|
|
+
|
|
|
+- s = glGetString(GL_SHADING_LANGUAGE_VERSION);
|
|
|
++ s = reinterpret_cast<const char*>(glGetString(GL_SHADING_LANGUAGE_VERSION));
|
|
|
+ if (s)
|
|
|
+ CLog::Log(LOGINFO, "GL_SHADING_LANGUAGE_VERSION = %s", s);
|
|
|
+ else
|
|
|
+--
|
|
|
+2.30.2
|
|
|
+
|