From 23cd9c591e3c492ff429fd3ce6a0a3bc31dd2a02 Mon Sep 17 00:00:00 2001 From: revmischa Date: Sat, 28 Jul 2018 16:30:30 +0000 Subject: [PATCH] GLES and SSE2 fix stuff --- src/libprojectM/MilkdropPresetFactory/Param.hpp | 4 +++- src/libprojectM/MilkdropPresetFactory/PresetFrameIO.cpp | 3 +++ src/projectM-sdl/projectM_SDL_main.cpp | 8 ++++++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/libprojectM/MilkdropPresetFactory/Param.hpp b/src/libprojectM/MilkdropPresetFactory/Param.hpp index c2631cd6c..59dd6e431 100755 --- a/src/libprojectM/MilkdropPresetFactory/Param.hpp +++ b/src/libprojectM/MilkdropPresetFactory/Param.hpp @@ -57,8 +57,10 @@ class InitCond; class Param; class Preset; -//#include + +#ifdef __SSE2__ #include +#endif /* Parameter Type */ diff --git a/src/libprojectM/MilkdropPresetFactory/PresetFrameIO.cpp b/src/libprojectM/MilkdropPresetFactory/PresetFrameIO.cpp index 28d25ab5a..ed2244033 100644 --- a/src/libprojectM/MilkdropPresetFactory/PresetFrameIO.cpp +++ b/src/libprojectM/MilkdropPresetFactory/PresetFrameIO.cpp @@ -5,7 +5,10 @@ #include #include #include "Renderer/BeatDetect.hpp" + +#ifdef __SSE2__ #include +#endif PresetInputs::PresetInputs() : PipelineContext() diff --git a/src/projectM-sdl/projectM_SDL_main.cpp b/src/projectM-sdl/projectM_SDL_main.cpp index 19da66c47..29c003771 100644 --- a/src/projectM-sdl/projectM_SDL_main.cpp +++ b/src/projectM-sdl/projectM_SDL_main.cpp @@ -89,6 +89,10 @@ int main(int argc, char *argv[]) { } } } + // use GLES 2.0 (this may need adjusting) + SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2); + SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0); + SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES); #else // Disabling compatibility profile @@ -151,8 +155,8 @@ int main(int argc, char *argv[]) { #if !FAKE_AUDIO // get an audio input device - app->openAudioInput(); - app->beginAudioCapture(); + if (app->openAudioInput()) + app->beginAudioCapture(); #endif