fix #5611

spring · Jun 11, 2017 · 35fc58d · 35fc58d
1 parent 759e17c
commit 35fc58d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/rts/Rendering/GL/myGL.cpp b/rts/Rendering/GL/myGL.cpp
@@ -6,6 +6,10 @@
 #include <cmath>
 
 #include <SDL.h>
+#if (!defined(HEADLESS) && !defined(WIN32) && !defined(__APPLE__))
+// need this for glXQueryCurrentRendererIntegerMESA (glxext)
+#include <GL/glxew.h>
+#endif
 
 #include "myGL.h"
 #include "VertexArray.h"
@@ -139,7 +143,6 @@ static bool GetVideoMemInfoMESA(GLint* memInfo)
 	if (!GLXEW_MESA_query_renderer)
 		return false;
 
-	// FIXME? may need to include glx.h (or glxext.h directly)
 	typedef PFNGLXQUERYCURRENTRENDERERINTEGERMESAPROC QCRIProc;
 
 	static constexpr const GLubyte* qcriProcName = (const GLubyte*) "glXQueryCurrentRendererIntegerMESA";
@@ -149,7 +152,7 @@ static bool GetVideoMemInfoMESA(GLint* memInfo)
 		return false;
 
 	// note: unlike the others, this value is returned in megabytes
-	qcriProcAddr(GLX_RENDERER_VIDEO_MEMORY_MESA, &memInfo[0]);
+	qcriProcAddr(GLX_RENDERER_VIDEO_MEMORY_MESA, reinterpret_cast<unsigned int*>(&memInfo[0]));
 
 	memInfo[0] *= 1024;
 	memInfo[1] = memInfo[0];

diff --git a/rts/Rendering/Textures/Bitmap.cpp b/rts/Rendering/Textures/Bitmap.cpp
@@ -923,7 +923,9 @@ void CBitmap::InvertColors()
 
 void CBitmap::InvertAlpha()
 {
-	if (compressed) return; // Don't try to invert DDS
+	if (compressed)
+		return; // Don't try to invert DDS
+
 	for (int y = 0; y < ysize; ++y) {
 		for (int x = 0; x < xsize; ++x) {
 			const int base = ((y * xsize) + x) * 4;
@@ -933,11 +935,11 @@ void CBitmap::InvertAlpha()
 }
 
 
-void CBitmap::GrayScale()
+void CBitmap::MakeGrayScale()
 {
-	if (compressed) {
+	if (compressed)
 		return;
-	}
+
 	for (int y = 0; y < ysize; ++y) {
 		for (int x = 0; x < xsize; ++x) {
 			const int base = ((y * xsize) + x) * 4;

diff --git a/rts/Rendering/Textures/Bitmap.h b/rts/Rendering/Textures/Bitmap.h
@@ -76,7 +76,7 @@ class CBitmap
 	void ReverseYAxis();
 	void InvertColors();
 	void InvertAlpha();
-	void GrayScale();
+	void MakeGrayScale();
 	void Tint(const float tint[3]);
 };
 

diff --git a/rts/Rendering/Textures/NamedTextures.cpp b/rts/Rendering/Textures/NamedTextures.cpp
@@ -216,7 +216,7 @@ namespace CNamedTextures {
 		} else {
 			if (resize) bitmap = bitmap.CreateRescaled(resizeDimensions.x,resizeDimensions.y);
 			if (invert) bitmap.InvertColors();
-			if (greyed) bitmap.GrayScale();
+			if (greyed) bitmap.MakeGrayScale();
 			if (tint)   bitmap.Tint(tintColor);
 
 			//! make the texture