Skip to content

Don't use GLEW in Fireworks #49341

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 11, 2025
Merged

Don't use GLEW in Fireworks #49341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Fireworks/Core/src/CmsAnnotation.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
#include <sstream>
#include <cmath>

#include "TGLIncludes.h"
#include <GL/gl.h>
#include <GL/glu.h>

#include "TGLCamera.h"
#include "TGLRnrCtx.h"
#include "TGLSelectRecord.h"
Expand Down
4 changes: 3 additions & 1 deletion Fireworks/Core/src/FWEveDigitSetScalableMarker.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#include "TGLIncludes.h"
#include <GL/gl.h>
#include <GL/glu.h>

#include "Fireworks/Core/src/FWEveDigitSetScalableMarker.h"

void FWEveDigitSetScalableMarkerGL::DirectDraw(TGLRnrCtx& rnrCtx) const {
Expand Down
22 changes: 11 additions & 11 deletions Fireworks/Core/src/FWGUIManager.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,12 @@
#include <thread>
#include <future>

#include <GL/gl.h>
#include <GL/glu.h>

#include "TGButton.h"
#include "TGLabel.h"
#include "TSystem.h"
#include "TGLIncludes.h"
#include "TGLViewer.h"
#include "TEveBrowser.h"
#include "TEveManager.h"
Expand Down Expand Up @@ -849,16 +851,14 @@ void FWGUIManager::exportAllViews(const std::string& format, int height) {
TString file;
file.Form(format.c_str(), event->id().run(), event->id().event(), event->luminosityBlock(), view_name.Data());

if (GLEW_EXT_framebuffer_object) {
// Multi-threaded save
futures.push_back((*j)->CaptureAndSaveImage(file, height));
} else {
// Single-threaded save
if (height == -1)
(*j)->GetGLViewer()->SavePicture(file);
else
(*j)->GetGLViewer()->SavePictureHeight(file, height);
}
// Multi-threaded save
futures.push_back((*j)->CaptureAndSaveImage(file, height));

// Single-threaded save
// if (height == -1)
// (*j)->GetGLViewer()->SavePicture(file);
// else
// (*j)->GetGLViewer()->SavePictureHeight(file, height);
}
}

Expand Down
4 changes: 3 additions & 1 deletion Fireworks/Core/src/FWGeoTopNodeGL.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
#include "Fireworks/Core/src/FWGeoTopNodeGL.h"
#include "Fireworks/Core/interface/FWGeoTopNode.h"

#include "TGLIncludes.h"
#include <GL/gl.h>
#include <GL/glu.h>

#include "TGLRnrCtx.h"
#include "TGLViewer.h"

Expand Down
4 changes: 3 additions & 1 deletion Fireworks/Core/src/FWTEveViewer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,11 @@
// user include files

#include "TMath.h"
#include "TGLIncludes.h"
#include "TGLFBO.h"

#include <GL/gl.h>
#include <GL/glu.h>

#include "Fireworks/Core/interface/FWTEveViewer.h"
#include "Fireworks/Core/interface/FWTGLViewer.h"

Expand Down
8 changes: 3 additions & 5 deletions Fireworks/Core/src/FWTGLViewer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@

#include "TMath.h"

#include "TGLIncludes.h"
#include <GL/gl.h>
#include <GL/glu.h>

#include "TGLFBO.h"
#include "TGLWidget.h"

Expand Down Expand Up @@ -142,10 +144,6 @@ TGLFBO* FWTGLViewer::GenerateFbo(Int_t w, Int_t h, Float_t pixel_object_scale) {

static const TString eh("FWTGLViewer::SavePictureUsingFBO");

if (!GLEW_EXT_framebuffer_object) {
::Warning(eh, "Missing FBO support.");
}

if (!TakeLock(kDrawLock)) {
::Error(eh, "viewer locked - try later.");
return nullptr;
Expand Down
3 changes: 2 additions & 1 deletion Fireworks/Core/src/FWTextProjected.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
#include "TEveTrans.h"
#include "TGLBoundingBox.h"

#include "TGLIncludes.h"
#include <GL/gl.h>
#include <GL/glu.h>

#include "TGLRnrCtx.h"
#include "TGLUtil.h"
Expand Down
4 changes: 3 additions & 1 deletion Fireworks/Vertices/src/TEveEllipsoidGL.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
#include "TMatrixDSym.h"

#include "TDecompSVD.h"
#include "TGLIncludes.h"

#include <GL/gl.h>
#include <GL/glu.h>

//==============================================================================
// TEveEllipsoidGL
Expand Down