mirror of
https://github.com/baldurk/renderdoc.git
synced 2026-05-04 17:10:47 +00:00
Remove obsolete workarounds to force shared library linking
As the --no-as-needed linker option was added there is now no need to force link to GL/EGL shared libraries via extern methods.
This commit is contained in:
committed by
Baldur Karlsson
parent
081f65dff1
commit
588eb083db
@@ -361,23 +361,6 @@ void DisplayRendererPreview(IReplayRenderer *renderer, TextureDisplay &displayCf
|
||||
#endif
|
||||
}
|
||||
|
||||
#if defined(RENDERDOC_SUPPORT_GL)
|
||||
|
||||
// symbol defined in libGL but not librenderdoc.
|
||||
// Forces link of libGL after renderdoc (otherwise all symbols would
|
||||
// be resolved and libGL wouldn't link, meaning dlsym(RTLD_NEXT) would fai
|
||||
extern "C" void glXWaitX();
|
||||
|
||||
#endif
|
||||
|
||||
#if defined(RENDERDOC_SUPPORT_GLES)
|
||||
|
||||
// symbol defined in libEGL but not in librenderdoc.
|
||||
// Forces link of libEGL.
|
||||
extern "C" int eglWaitGL(void);
|
||||
|
||||
#endif
|
||||
|
||||
void sig_handler(int signo)
|
||||
{
|
||||
if(usingKillSignal)
|
||||
@@ -389,21 +372,6 @@ void sig_handler(int signo)
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
setlocale(LC_CTYPE, "");
|
||||
volatile bool never_run = false;
|
||||
|
||||
#if defined(RENDERDOC_SUPPORT_GL)
|
||||
|
||||
if(never_run)
|
||||
glXWaitX();
|
||||
|
||||
#endif
|
||||
|
||||
#if defined(RENDERDOC_SUPPORT_GLES)
|
||||
|
||||
if(never_run)
|
||||
eglWaitGL();
|
||||
|
||||
#endif
|
||||
|
||||
signal(SIGINT, sig_handler);
|
||||
signal(SIGTERM, sig_handler);
|
||||
|
||||
Reference in New Issue
Block a user