From: Tim Rowley <timothy.o.rowley@intel.com>
Date: Fri, 7 Apr 2017 16:41:25 +0000 (-0500)
Subject: swr: [rasterizer archrast] Fix archrast for MSVC 2017 compiler
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7abd1f9b2462e5b050e91630b73c71e9128f5683;p=mesa.git

swr: [rasterizer archrast] Fix archrast for MSVC 2017 compiler

Reviewed-by: Bruce Cherniak <bruce.cherniak@intel.com>
---

diff --git a/src/gallium/drivers/swr/rasterizer/archrast/archrast.cpp b/src/gallium/drivers/swr/rasterizer/archrast/archrast.cpp
index a7d41e27c0d..cda161246bb 100644
--- a/src/gallium/drivers/swr/rasterizer/archrast/archrast.cpp
+++ b/src/gallium/drivers/swr/rasterizer/archrast/archrast.cpp
@@ -298,7 +298,7 @@ namespace ArchRast
     }
 
     // Dispatch event for this thread.
-    void Dispatch(HANDLE hThreadContext, Event& event)
+    void Dispatch(HANDLE hThreadContext, const Event& event)
     {
         EventManager* pManager = FromHandle(hThreadContext);
         SWR_ASSERT(pManager != nullptr);
diff --git a/src/gallium/drivers/swr/rasterizer/archrast/archrast.h b/src/gallium/drivers/swr/rasterizer/archrast/archrast.h
index 1b81e6e952b..fa88a4948c9 100644
--- a/src/gallium/drivers/swr/rasterizer/archrast/archrast.h
+++ b/src/gallium/drivers/swr/rasterizer/archrast/archrast.h
@@ -42,7 +42,7 @@ namespace ArchRast
     void DestroyThreadContext(HANDLE hThreadContext);
 
     // Dispatch event for this thread.
-    void Dispatch(HANDLE hThreadContext, Event& event);
+    void Dispatch(HANDLE hThreadContext, const Event& event);
     void FlushDraw(HANDLE hThreadContext, uint32_t drawId);
 };
 
diff --git a/src/gallium/drivers/swr/rasterizer/archrast/eventmanager.h b/src/gallium/drivers/swr/rasterizer/archrast/eventmanager.h
index 44f75e44410..c251daf0361 100644
--- a/src/gallium/drivers/swr/rasterizer/archrast/eventmanager.h
+++ b/src/gallium/drivers/swr/rasterizer/archrast/eventmanager.h
@@ -60,7 +60,7 @@ namespace ArchRast
             mHandlers.push_back(pHandler);
         }
 
-        void Dispatch(Event& event)
+        void Dispatch(const Event& event)
         {
             ///@todo Add event filter check here.
 
diff --git a/src/gallium/drivers/swr/rasterizer/codegen/templates/gen_ar_event.cpp b/src/gallium/drivers/swr/rasterizer/codegen/templates/gen_ar_event.cpp
index d48fda61c2a..1ecb455c3a1 100644
--- a/src/gallium/drivers/swr/rasterizer/codegen/templates/gen_ar_event.cpp
+++ b/src/gallium/drivers/swr/rasterizer/codegen/templates/gen_ar_event.cpp
@@ -37,7 +37,7 @@
 using namespace ArchRast;
 % for name in protos['event_names']:
 
-void ${name}::Accept(EventHandler* pHandler)
+void ${name}::Accept(EventHandler* pHandler) const
 {
     pHandler->Handle(*this);
 }
diff --git a/src/gallium/drivers/swr/rasterizer/codegen/templates/gen_ar_event.hpp b/src/gallium/drivers/swr/rasterizer/codegen/templates/gen_ar_event.hpp
index e792f5f63e6..685a10b3867 100644
--- a/src/gallium/drivers/swr/rasterizer/codegen/templates/gen_ar_event.hpp
+++ b/src/gallium/drivers/swr/rasterizer/codegen/templates/gen_ar_event.hpp
@@ -57,7 +57,7 @@ namespace ArchRast
         Event() {}
         virtual ~Event() {}
 
-        virtual void Accept(EventHandler* pHandler) = 0;
+        virtual void Accept(EventHandler* pHandler) const = 0;
     };
 % for name in protos['event_names']:
 
@@ -102,7 +102,7 @@ namespace ArchRast
         % endfor
         }
 
-        virtual void Accept(EventHandler* pHandler);
+        virtual void Accept(EventHandler* pHandler) const;
     };
 % endfor
 }
\ No newline at end of file