aboutsummaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers
diff options
context:
space:
mode:
authorJan Zielinski <[email protected]>2019-12-12 14:07:20 +0100
committerJan Zielinski <[email protected]>2019-12-12 14:35:23 +0100
commitbd5077ae1dfaa1f5652a7a1febfcc0f27b030823 (patch)
treeeafd260b9d32067d70b238bed8a9e798929542d4 /src/gallium/drivers
parenta0f1a5fa051786c16de6f0062771051f8565daec (diff)
gallium/swr: Fix Windows build
Tessellator defines own fmin/fmax functions that conflict with those defined in cmath header. Need to use legacy math.h which was originally used in MS code. Reviewed-by: Krzysztof Raszkowski <[email protected]>
Diffstat (limited to 'src/gallium/drivers')
-rw-r--r--src/gallium/drivers/swr/rasterizer/core/tessellator.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gallium/drivers/swr/rasterizer/core/tessellator.cpp b/src/gallium/drivers/swr/rasterizer/core/tessellator.cpp
index 6e12b691037..e0464c360fa 100644
--- a/src/gallium/drivers/swr/rasterizer/core/tessellator.cpp
+++ b/src/gallium/drivers/swr/rasterizer/core/tessellator.cpp
@@ -18,8 +18,11 @@
*/
#include "tessellator.hpp"
-// #include <math.h> // ceil
+#if defined(_WIN32) || defined(_WIN64)
+#include <math.h> // ceil
+#else
#include <cmath>
+#endif
//#include <windows.h> // Just used for some commented out debug stat printing.
//#include <strsafe.h> // Ditto.
#define min(x,y) (x < y ? x : y)