Fix 3d drawing with EGL, fix wxJSON stuff compiling on ubuntu 22.04

xLightsSequencer · Jan 15, 2025 · fa3a717 · fa3a717
1 parent e7afb8d
commit fa3a717
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/xLights/graphics/opengl/xlOGL3GraphicsContext.cpp b/xLights/graphics/opengl/xlOGL3GraphicsContext.cpp
@@ -2110,7 +2110,6 @@ xlGraphicsContext* xlOGL3GraphicsContext::SetViewport(int topleft_x, int topleft
         frameData.MVP = m;
         frameData.perspectiveMatrix = frameData.MVP;
 
-        LOG_GL_ERRORV(glClearColor(0,0,0,0));   // background color
         LOG_GL_ERRORV(glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT));
         glEnable(GL_DEPTH_TEST);
         glDepthFunc(GL_LEQUAL);

diff --git a/xLights/xLights.cbp.mak b/xLights/xLights.cbp.mak
@@ -4396,7 +4396,7 @@ effects/ServoEffect.cpp: ../include/servo-16.xpm ../include/servo-24.xpm ../incl
 
 effects/RipplePanel.cpp: effects/RipplePanel.h effects/EffectPanelUtils.h effects/RippleEffect.h
 
-effects/ShaderPanel.cpp: effects/ShaderPanel.h effects/ShaderEffect.h BulkEditControls.h effects/EffectPanelUtils.h ShaderDownloadDialog.h ExternalHooks.h xLightsMain.h xLightsApp.h TimingPanel.h
+effects/ShaderPanel.cpp: effects/ShaderPanel.h effects/ShaderEffect.h BulkEditControls.h effects/EffectPanelUtils.h ShaderDownloadDialog.h ExternalHooks.h xLightsMain.h xLightsApp.h TimingPanel.h UtilFunctions.h
 
 effects/RenderableEffect.cpp: effects/RenderableEffect.h sequencer/Effect.h effects/EffectManager.h effects/assist/xlGridCanvasEmpty.h UtilFunctions.h ExternalHooks.h sequencer/SequenceElements.h ValueCurveButton.h PixelBuffer.h effects/FanEffect.h effects/SpiralsEffect.h effects/PinwheelEffect.h effects/EffectPanelUtils.h ColorPanel.h BufferPanel.h TimingPanel.h BitmapCache.h xLightsApp.h xLightsMain.h models/SubModel.h
 
@@ -4470,7 +4470,7 @@ effects/MovingHeadPanels/MHColorWheelPanel.cpp: UtilFunctions.h
 
 effects/PinwheelEffect.cpp: effects/PinwheelEffect.h effects/PinwheelPanel.h sequencer/Effect.h RenderBuffer.h UtilClasses.h ../include/pinwheel-16.xpm ../include/pinwheel-24.xpm ../include/pinwheel-32.xpm ../include/pinwheel-48.xpm ../include/pinwheel-64.xpm Parallel.h
 
-effects/PicturesPanel.cpp: effects/PicturesPanel.h effects/PicturesEffect.h effects/EffectPanelUtils.h effects/GIFImage.h ExternalHooks.h
+effects/PicturesPanel.cpp: effects/PicturesPanel.h effects/PicturesEffect.h effects/EffectPanelUtils.h effects/GIFImage.h ExternalHooks.h UtilFunctions.h
 
 effects/PicturesPanel.h: BulkEditControls.h effects/EffectPanelUtils.h
 

diff --git a/xSchedule/wxJSON/json_defs.h b/xSchedule/wxJSON/json_defs.h
@@ -194,11 +194,11 @@
 // key/value containers (see the docs: wxJSON internals: array and hash_map
 #undef wxJSON_USE_STL
 #if defined( wxUSE_STL ) && wxUSE_STL == 1
-#define wxJSON_USE_STL
+// #define wxJSON_USE_STL
 #endif
 #ifndef wxJSON_USE_STL
 #if wxUSE_STD_CONTAINERS
-#define wxJSON_USE_STL
+// #define wxJSON_USE_STL
 #endif
 #endif