Mesa (staging/20.1): gallium/swr: Fix building swr with MSVC

[GitLab Mirror]

Module: Mesa
Branch: staging/20.1
Commit: a9a61b91a87aed9cfc005981d8692a353e399523
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a9a61b91a87aed9cfc005981d8692a353e399523

Author: Krzysztof Raszkowski <krzysztof.raszkowski at intel.com>
Date:   Fri May 22 17:29:01 2020 +0200

gallium/swr: Fix building swr with MSVC

Fix building swr with MSVC by turning off
UNICODE before including windows.h.

Reviewed-by: Jan Zielinski <jan.zielinski at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5166>
(cherry picked from commit 09fc9c5f6ca02e5eebc5a11771c2cc1a9df5fc7e)

---

 .pick_status.json                              | 2 +-
 src/gallium/drivers/swr/rasterizer/common/os.h | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index d8b725e032b..1415d0d3a9a 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -7483,7 +7483,7 @@
         "description": "gallium/swr: Fix building swr with MSVC",
         "nominated": false,
         "nomination_type": null,
-        "resolution": 4,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/drivers/swr/rasterizer/common/os.h b/src/gallium/drivers/swr/rasterizer/common/os.h
index a52bc0e0db6..bda114d64e2 100644
--- a/src/gallium/drivers/swr/rasterizer/common/os.h
+++ b/src/gallium/drivers/swr/rasterizer/common/os.h
@@ -33,9 +33,11 @@
 #define SWR_VISIBLE __declspec(dllexport)
 
 #ifndef NOMINMAX
+#undef UNICODE
 #define NOMINMAX
 #include <windows.h>
 #undef NOMINMAX
+#define UNICODE
 #else
 #include <windows.h>
 #endif