mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-02-05 20:15:44 +00:00
Code Issues Projects Releases Wiki Activity

Do away with Intrinsics.h

Browse Source
This commit is contained in:
Mischa Spiegelmock
2021-02-20 21:40:39 +02:00
parent 3cd8efac81
commit b3c3282eb0
9 changed files with 12 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -1,4 +1,4 @@
AC_INIT([projectM], [3.1.11], [me@mish.dev], [projectM], [https://github.com/projectM-visualizer/projectm/])
AC_INIT([projectM], [3.1.12], [me@mish.dev], [projectM], [https://github.com/projectM-visualizer/projectm/])
AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects tar-pax])
AX_IS_RELEASE([git-directory])

2
src/libprojectM/Common.hpp
View File

@ -31,8 +31,6 @@
#include <cstdarg>
#include <cassert>
#include "Intrinsics.h"
#ifdef _MSC_VER
#define strcasecmp(s, t) _strcmpi(s, t)
#endif

16
src/libprojectM/Intrinsics.h
View File

@ -1,16 +0,0 @@
//
// Intrinsics.h
// libprojectM
//
// Created by Mischa Spiegelmock on 2/13/21.
//
#ifndef PRJMIntrinsics_h
#define PRJMIntrinsics_h
// try to detect if we have SSE2 (intel only)
#ifdef __SSE2__
#define _HAS_SSE2_ 1
#endif
#endif /* PRJMIntrinsics_h */

2
src/libprojectM/Makefile.am
View File

@ -29,7 +29,7 @@ libprojectM_la_SOURCES = ConfigFile.cpp Preset.cpp PresetLoader.cpp timer.cpp \
HungarianMethod.hpp Preset.hpp RandomNumberGenerators.hpp\
IdleTextures.hpp PresetChooser.hpp TimeKeeper.hpp\
KeyHandler.hpp PresetFactory.hpp projectM.hpp\
BackgroundWorker.h Intrinsics.h \
BackgroundWorker.h \
PCM.hpp PresetFactoryManager.hpp\
projectM.hpp projectM-opengl.h \
ConfigFile.h \

4
src/libprojectM/MilkdropPresetFactory/MilkdropPreset.cpp
View File

@ -44,7 +44,7 @@
#include "PresetFactoryManager.hpp"
#include "MilkdropPresetFactory.hpp"
#ifdef _HAS_SSE2_
#ifdef __SSE2__
#include <immintrin.h>
#endif
@ -391,7 +391,7 @@ void MilkdropPreset::evaluateFrame()
}
#ifdef _HAS_SSE2_
#ifdef __SSE2__
inline void init_mesh(float **mesh, const float value, const int gx, const int gy)
{
__m128 mvalue = _mm_set_ps1(value);

2
src/libprojectM/MilkdropPresetFactory/Param.hpp
View File

@ -60,7 +60,7 @@ class Preset;
class Test;
#ifdef _HAS_SSE2_
#ifdef __SSE2__
#include <immintrin.h>
#endif

6
src/libprojectM/MilkdropPresetFactory/PresetFrameIO.cpp
View File

@ -6,7 +6,7 @@
#include <cmath>
#include "Renderer/BeatDetect.hpp"
#ifdef _HAS_SSE2_
#ifdef __SSE2__
#include <immintrin.h>
#endif
@ -235,7 +235,7 @@ void PresetOutputs::PerPixelMath_c(const PipelineContext &context)
}
#ifdef _HAS_SSE2_
#ifdef __SSE2__
// is there an SSE way to do this?
inline __m128 _mm_pow(__m128 x, __m128 y)
@ -448,7 +448,7 @@ void PresetOutputs::PerPixelMath_sse(const PipelineContext &context)
void PresetOutputs::PerPixelMath(const PipelineContext &context)
{
#ifdef _HAS_SSE2_
#ifdef __SSE2__
PerPixelMath_sse(context);
#else
PerPixelMath_c(context);

2
src/libprojectM/MilkdropPresetFactory/PresetFrameIO.hpp
View File

@ -141,7 +141,7 @@ public:
private:
void PerPixelMath_c( const PipelineContext &context);
#ifdef _HAS_SSE2_
#ifdef __SSE2__
void PerPixelMath_sse( const PipelineContext &context);
#endif
};

5
src/projectM-sdl/SDLprojectM.xcodeproj/project.pbxproj
View File

@ -543,6 +543,7 @@
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = "-DDATADIR_PATH='\"/usr/local/share/projectM\"'";
OTHER_LDFLAGS = "-lSDL2";
};
name = Debug;
};
@ -588,7 +589,9 @@
LIBRARY_SEARCH_PATHS = /usr/local/lib;
MACOSX_DEPLOYMENT_TARGET = 10.9;
MTL_ENABLE_DEBUG_INFO = NO;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = "-DDATADIR_PATH='\"/usr/local/share/projectM\"'";
OTHER_LDFLAGS = "-lSDL2";
};
name = Release;
};
@ -604,7 +607,6 @@
INFOPLIST_FILE = "$(SRCROOT)/projectM-SDL/Info.plist";
LIBRARY_SEARCH_PATHS = /usr/local/lib;
MARKETING_VERSION = 3.1.11;
OTHER_LDFLAGS = "-lSDL2";
PRODUCT_BUNDLE_IDENTIFIER = net.projectm.sdl;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
@ -624,7 +626,6 @@
INFOPLIST_FILE = "$(SRCROOT)/projectM-SDL/Info.plist";
LIBRARY_SEARCH_PATHS = /usr/local/lib;
MARKETING_VERSION = 3.1.11;
OTHER_LDFLAGS = "-lSDL2";
PRODUCT_BUNDLE_IDENTIFIER = net.projectm.sdl;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";