From 140ca50c5b0e35e1e8595d1b9c7e1616af7a9984 Mon Sep 17 00:00:00 2001
From: derwin12 <4643499+derwin12@users.noreply.github.com>
Date: Tue, 28 Jan 2025 09:44:24 -0500
Subject: [PATCH] Windows ISPC *DO NOT MERGE*
---
xLights/Xlights.vcxproj | 67 ++++++++++++++++++-
xLights/Xlights.vcxproj.filters | 10 +++
xLights/effects/ButterflyEffect.cpp | 3 -
xLights/effects/PinwheelEffect.cpp | 3 -
xLights/effects/PlasmaEffect.cpp | 3 -
xLights/effects/ispc/ISPCComputeUtilities.cpp | 2 -
6 files changed, 75 insertions(+), 13 deletions(-)
diff --git a/xLights/Xlights.vcxproj b/xLights/Xlights.vcxproj
index 76fecdcd1..117c58849 100644
--- a/xLights/Xlights.vcxproj
+++ b/xLights/Xlights.vcxproj
@@ -218,7 +218,7 @@
Level3
Disabled
- _DEBUG;_WINDOWS;%(PreprocessorDefinitions);WXDEBUG;__WXDEBUG__;_CRT_SECURE_NO_WARNINGS;IGNORE_VENDORS;$(DefineConstants);wxUSE_WEBP
+ HASISPC;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);WXDEBUG;__WXDEBUG__;_CRT_SECURE_NO_WARNINGS;IGNORE_VENDORS;$(DefineConstants);wxUSE_WEBP
true
stdcpp20
/D "NOMINMAX"
@@ -344,7 +344,7 @@ xcopy "$(SolutionDir)..\bin64\Vamp\" "$(TargetDir)Vamp\" /e /y /i /r
MaxSpeed
true
true
- NDEBUG;_WINDOWS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;IGNORE_VENDORS;$(DefineConstants)
+ XXHASISPC;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;IGNORE_VENDORS;$(DefineConstants)
true
stdcpp20
/D "NOMINMAX" %(AdditionalOptions)
@@ -1065,8 +1065,15 @@ xcopy "$(SolutionDir)..\bin64\Vamp\" "$(TargetDir)Vamp\" /e /y /i /r
+
+
+
+
+
+
+
@@ -1521,6 +1528,62 @@ xcopy "$(SolutionDir)..\bin64\Vamp\" "$(TargetDir)Vamp\" /e /y /i /r
+
+
+ false
+ Document
+ false
+ echo "%(FullPath)" > "E:\debug_ouput.txt"
+echo "$(IntDir)%(Filename).obj" >> "E:\debug_ouput.txt"
+ispc.exe "%(FullPath)" -o "$(IntDir)%(Filename).obj" --target=host
+ $(IntDir)%(Filename).obj
+ $(InputPath)
+ echo "%(FullPath)" > "E:\debug_ouput.txt"
+echo "$(IntDir)%(Filename).obj" >> "E:\debug_ouput.txt"
+ispc.exe "%(FullPath)" -o "$(IntDir)%(Filename).obj" --target=host
+ $(IntDir)%(FileName).obj
+ $(InputPath)
+
+
+
+
+ false
+ Document
+ ispc.exe "%(FullPath)" -o "$(IntDir)%(Filename).obj" --target=host
+ $(IntDir)%(Filename).obj
+ $(InputPath)
+ $(IntDir)%(Filename).obj
+ $(InputPath)
+ ispc.exe "%(FullPath)" -o "$(IntDir)%(Filename).obj" --target=host
+ false
+
+
+
+
+ false
+ Document
+ $(InputPath)
+ $(InputPath)
+ false
+ ispc.exe "%(FullPath)" -o "$(IntDir)%(Filename).obj" --target=host
+ ispc.exe "%(FullPath)" -o "$(IntDir)%(Filename).obj" --target=host
+ $(IntDir)%(Filename).obj
+ $(IntDir)%(Filename).obj
+
+
+
+
+ false
+ Document
+ ispc.exe "%(FullPath)" --target=host -o "$(IntDir)%(Filename).obj"
+ $(IntDir)%(Filename).obj
+ $(InputPath)
+ false
+ ispc.exe "%(FullPath)" --target=host -o "$(IntDir)%(Filename).obj"
+ $(IntDir)%(Filename).obj
+ $(InputPath)
+
+
diff --git a/xLights/Xlights.vcxproj.filters b/xLights/Xlights.vcxproj.filters
index ba3fd7d4c..2f3252ed6 100644
--- a/xLights/Xlights.vcxproj.filters
+++ b/xLights/Xlights.vcxproj.filters
@@ -2203,6 +2203,10 @@
Effects\ispc
+
+
+
+
@@ -2262,4 +2266,10 @@
automation
+
+
+
+
+
+
\ No newline at end of file
diff --git a/xLights/effects/ButterflyEffect.cpp b/xLights/effects/ButterflyEffect.cpp
index 90d8b9fb7..3df4964fe 100644
--- a/xLights/effects/ButterflyEffect.cpp
+++ b/xLights/effects/ButterflyEffect.cpp
@@ -24,10 +24,7 @@
#include "../Parallel.h"
-#ifndef __WXMSW__
#include "ispc/ButterflyFunctions.ispc.h"
-#define HASISPC
-#endif
ButterflyEffect::ButterflyEffect(int i) : RenderableEffect(i, "Butterfly", butterfly_16, butterfly_24, butterfly_32, butterfly_48, butterfly_64)
{
diff --git a/xLights/effects/PinwheelEffect.cpp b/xLights/effects/PinwheelEffect.cpp
index 458b52fa2..30e352894 100644
--- a/xLights/effects/PinwheelEffect.cpp
+++ b/xLights/effects/PinwheelEffect.cpp
@@ -24,10 +24,7 @@
#include "../Parallel.h"
-#ifndef __WXMSW__
#include "ispc/PinwheelFunctions.ispc.h"
-#define HASISPC
-#endif
PinwheelEffect::PinwheelEffect(int id) : RenderableEffect(id, "Pinwheel", pinwheel_16, pinwheel_24, pinwheel_32, pinwheel_48, pinwheel_64)
{
diff --git a/xLights/effects/PlasmaEffect.cpp b/xLights/effects/PlasmaEffect.cpp
index 0996c84f2..a1a96eb52 100644
--- a/xLights/effects/PlasmaEffect.cpp
+++ b/xLights/effects/PlasmaEffect.cpp
@@ -24,10 +24,7 @@
#include "../Parallel.h"
-#ifndef __WXMSW__
#include "ispc/PlasmaFunctions.ispc.h"
-#define HASISPC
-#endif
PlasmaEffect::PlasmaEffect(int id) : RenderableEffect(id, "Plasma", plasma_16, plasma_24, plasma_32, plasma_48, plasma_64)
diff --git a/xLights/effects/ispc/ISPCComputeUtilities.cpp b/xLights/effects/ispc/ISPCComputeUtilities.cpp
index cb0d954da..0f333a8c9 100644
--- a/xLights/effects/ispc/ISPCComputeUtilities.cpp
+++ b/xLights/effects/ispc/ISPCComputeUtilities.cpp
@@ -16,9 +16,7 @@
ISPCComputeUtilities ISPCComputeUtilities::INSTANCE;
-#ifndef __WXMSW__
#define HASISPC
-#endif
#ifdef HASISPC