Skip to content

Commit c26dcf2

Browse files
committed
Deprecate TGLIncludes.h and builtin GLEW headers
This follows up on 9ede110, which deprecated the `TGLWSIncludes.h`. The `TGLIncludes.h` header was kept for backwards compatibility, but it doesn't make much sense to keep it around because it only includes `GL/glew.h`, which we aim to replace anyway.
1 parent c03c7ea commit c26dcf2

File tree

4 files changed

+16
-7
lines changed

4 files changed

+16
-7
lines changed

README/ReleaseNotes/v638/index.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ The following people have contributed to this new version:
4141
* The `RooDataSet` constructors to construct a dataset from a part of an existing dataset were deprecated in ROOT 6.36 and are now removed. This is to avoid interface duplication. Please use `RooAbsData::reduce()` instead, or if you need to change the weight column, use the universal constructor with the `Import()`, `Cut()`, and `WeightVar()` arguments.
4242
* The `RooStats::HLFactory` class that was deprecated in ROOT 6.36 is now removed. It provided little advantage over using the RooWorkspace directly or any of the other higher-level frameworks that exist in the RooFit ecosystem.
4343
* The build options `mysql`, `odbc` and `pgsql`, that were deprecated in ROOT 6.36, are now removed.
44-
* The `TGLWSIncludes.h` header is deprecated and will be removed in ROOT 6.40
44+
* The `TGLIncludes.h` and `TGLWSIncludes.h` headers are deprecated and will be removed in ROOT 6.40. Please include your required headers like `<GL/gl.h>` or `<GL/glu.h>` directly.
45+
* The GLEW headers (`GL/eglew.h`, `GL/glew.h`, `GL/glxew.h`, and `GL/wglew.h`) that are installed when building ROOT with `builtin_glew=ON` are deprecated and will be removed in ROOT 6.40. This is done because ROOT will move away from GLEW for loading OpenGL extensions.
4546
* The `ROOT::Math::TDataPointN` class that can be used with the `ROOT::Math::KDETree` was removed. Use the templated `TDataPoint<N>` instead.
4647
* The Parallel ROOT Facility, `PROOF`, has been removed from the repository.
4748
* After being deprecated for a long period, the `-r` option of `rootcling` has been removed.
@@ -230,7 +231,7 @@ the deprecation period was extended.
230231
* Support dark mode when store images
231232
* With 'Shift' key pressed whole graph is moved by dragging action
232233
* Support `Xall` and `Yall` as projections width
233-
* Implement `unzipJSON()` function for data embeding in jupyter
234+
* Implement `unzipJSON()` function for data embedding in jupyter
234235
* Support reading `TBranch` from very old ROOT files with custom streamers
235236
* Upgrade three.js r174 -> r180
236237
* Upgrade lil-gui.mjs 0.19.2 -> 0.20.0
@@ -301,7 +302,7 @@ More than 240 items were addressed for this release:
301302
* [[#19867](https://github.com/root-project/root/issues/19867)] - ROOT dictionary crash related to default template arguments
302303
* [[#19850](https://github.com/root-project/root/issues/19850)] - Error: "no member named 'getenv' in the global namespace" during the compilation with libc++
303304
* [[#19834](https://github.com/root-project/root/issues/19834)] - HasColumn crashing for an empty RDataFrame
304-
* [[#19820](https://github.com/root-project/root/issues/19820)] - Name collisions in Workspace when using RooAbsPdf.derviative()
305+
* [[#19820](https://github.com/root-project/root/issues/19820)] - Name collisions in Workspace when using RooAbsPdf.derivative()
305306
* [[#19814](https://github.com/root-project/root/issues/19814)] - Regression in 6.34: segfault when using TTreeReader on partially initialized TChain
306307
* [[#19777](https://github.com/root-project/root/issues/19777)] - Complete roottest/root/meta/callfunc runmemberFunc.C
307308
* [[#19776](https://github.com/root-project/root/issues/19776)] - “HIST” option for TRatioPlot(TH1*, THStack)
@@ -331,7 +332,7 @@ More than 240 items were addressed for this release:
331332
* [[#19362](https://github.com/root-project/root/issues/19362)] - [RDF] Automatic axis extension not working with weighted filling
332333
* [[#19359](https://github.com/root-project/root/issues/19359)] - Incorrect bin error with `TH1::SetBuffer` and `TH1::Sumw2`
333334
* [[#19349](https://github.com/root-project/root/issues/19349)] - typo: documentation for RooCrystalBall mathematical implementation does not match code implementation
334-
* [[#19346](https://github.com/root-project/root/issues/19346)] - Duplicated tests in tree/treeplayer/test lead to ramdom failures
335+
* [[#19346](https://github.com/root-project/root/issues/19346)] - Duplicated tests in tree/treeplayer/test lead to random failures
335336
* [[#19338](https://github.com/root-project/root/issues/19338)] - Feature Request ( Functions for Acoplanarity, Vector and Scalar Pt asymmetries)
336337
* [[#19333](https://github.com/root-project/root/issues/19333)] - Ninja build cannot start if `builtin_xrootd=ON`
337338
* [[#19330](https://github.com/root-project/root/issues/19330)] - A partial merge in TFileMerger creates directories that users didn't ask for
@@ -499,7 +500,7 @@ More than 240 items were addressed for this release:
499500
* [[ROOT-8093](https://its.cern.ch/jira/browse/8093)] - Gaussian with exponential tail(s) in roofit
500501
* [[ROOT-7973](https://its.cern.ch/jira/browse/7973)] - TChain::LoadTree() can crash when a different tree is read from the same file
501502
* [[ROOT-7743](https://its.cern.ch/jira/browse/7743)] - TTree AddFriend not working
502-
* [[ROOT-7686](https://its.cern.ch/jira/browse/7686)] - TTreeFormula and function arguements
503+
* [[ROOT-7686](https://its.cern.ch/jira/browse/7686)] - TTreeFormula and function arguments
503504
* [[ROOT-7465](https://its.cern.ch/jira/browse/7465)] - TTreeFormula unable to access all but first index of vector branch
504505
* [[ROOT-7439](https://its.cern.ch/jira/browse/7439)] - Missing TMethodCall::Execute signature
505506
* [[ROOT-6960](https://its.cern.ch/jira/browse/6960)] - TFormula/TTreeFormula: Virtualize Optimize() and part of AnalyzeFunction()

graf3d/ftgl/inc/FTGL.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@ typedef float FTGL_FLOAT;
1818
#define FT_RENDER_MODE_NORMAL ft_render_mode_normal
1919
#endif
2020

21-
#include "TGLIncludes.h"
21+
#ifdef WIN32
22+
#include "Windows4Root.h"
23+
#endif
24+
25+
#include <GL/glew.h>
2226

2327
#ifndef WIN32
2428
// Required for compatibility with glext.h style function definitions of

graf3d/gl/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ else()
233233
endif()
234234

235235
# Remove when not needed anymore in the ROOT 6.40 development cycle
236-
target_compile_definitions(RGL PRIVATE _ROOT_GL_BUILDS_ITSELF)
236+
target_compile_definitions(RGL PUBLIC _ROOT_GL_BUILDS_ITSELF)
237237

238238
if(MSVC AND builtin_glew)
239239
target_compile_definitions (RGL PRIVATE "GLEW_STATIC")

graf3d/rglew/inc/TGLIncludes.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414

1515
// GL includes - include this if you are calling OpenGL functions.
1616

17+
#ifndef _ROOT_GL_BUILDS_ITSELF
18+
#warning "The TGLIncludes.h header is deprecated and will be removed in ROOT 6.40. Please include the required headers like <GL/gl.h> or <GL/glu.h> directly."
19+
#endif
20+
1721
#ifdef WIN32
1822
#include "Windows4Root.h"
1923
#endif

0 commit comments

Comments
 (0)