speed-dreams/speed-dreams-code
6
0
Fork 1
Code Issues 8 Pull requests 1 Projects Releases Packages Wiki Activity Actions 2

Reduce minimum required OpenGL version from 3.3.0 to 2.1.0, and other fixes #3

Merged
xavi merged 3 commits from gl-renderer into main 2025-01-08 00:48:26 +01:00
Conversation 1 Commits 3 Files changed 3 +10 -5
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/checks.cmake
View file

@ -184,7 +184,7 @@ MACRO(CHECK_LIBRARIES)
ENDIF(ENET_FOUND)
# OpenGL
Find_Package(OpenGL)
Find_Package(OpenGL 2.1.0)
IF(OPENGL_FOUND)
SET(HAVE_LIBGL 1)

10
src/libs/tgfclient/guiscreen.cpp
View file

@ -377,7 +377,11 @@ SDL_Surface* gfScrCreateWindow(int nWinWidth, int nWinHeight, int nTotalDepth,in
}
#endif
/* Create OpenGL context */
GLContext = SDL_GL_CreateContext(GfuiWindow);
if (!(GLContext = SDL_GL_CreateContext(GfuiWindow)))
{
GfLogError("SDL_GL_CreateContext failed: %s\n", SDL_GetError());
return nullptr;
}
// If specified, try best possible settings.
PScreenSurface = SDL_CreateRGBSurface(0, nWinWidth, nWinHeight, nTotalDepth,
@ -427,8 +431,8 @@ bool GfScrInitSDL2(int nWinWidth, int nWinHeight, int nFullScreen)
SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE);
#else
// Version d'OpenGL
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 3);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_COMPATIBILITY);
#endif

3
src/modules/graphic/osggraph/Car/OsgCar.cpp
View file

@ -644,7 +644,8 @@ osg::ref_ptr<osg::Node> SDCar::loadCar(tCarElt *Car, bool tracktype, bool subcat
else
this->reflectionMappingMethod = REFLECTIONMAPPING_OFF;
this->shader = new SDCarShader(car_shaded_body.get(), this);
if (_carShader > 0)
this->shader = new SDCarShader(car_shaded_body.get(), this);
this->reflectionMapping = new SDReflectionMapping(this);
this->setReflectionMap(this->reflectionMapping->getReflectionMap());