Skip to content

Commit 5c076e1

Browse files
committed
[Improvement] (GLX/Lookup): Remove some junk code.
1 parent d512d4c commit 5c076e1

1 file changed

Lines changed: 7 additions & 8 deletions

File tree

src/main/cpp/glx/lookup.cpp

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
#define DEBUG 0
1717

18-
const char* handle_multidraw_func_name(const char* name) {
18+
std::string handle_multidraw_func_name(std::string name) {
1919
std::string namestr = name;
2020
if (namestr != "glMultiDrawElementsBaseVertex" && namestr != "glMultiDrawElements") {
2121
return name;
@@ -41,26 +41,25 @@ const char* handle_multidraw_func_name(const char* name) {
4141
break;
4242
default:
4343
LOG_W("get_multidraw_func() cannot determine multidraw emulation mode!")
44-
return nullptr;
44+
return {};
4545
}
4646

47-
return namestr.c_str();
47+
return namestr;
4848
}
4949

5050
void *glXGetProcAddress(const char *name) {
5151
LOG()
52-
name = handle_multidraw_func_name(name);
52+
std::string real_func_name = handle_multidraw_func_name(std::string(name));
5353
#ifdef __APPLE__
54-
return dlsym((void*)(~(uintptr_t)0), name);
54+
return dlsym((void*)(~(uintptr_t)0), real_func_name.c_str());
5555
#else
5656

5757
void* proc = nullptr;
5858

59-
proc = dlsym(RTLD_DEFAULT, (const char*)name);
59+
proc = dlsym(RTLD_DEFAULT, real_func_name.c_str());
6060

6161
if (!proc) {
62-
fprintf(stderr, "Failed to get OpenGL function %s: %s\n", name, dlerror());
63-
LOG_W("Failed to get OpenGL function: %s", (const char*)name)
62+
LOG_W("Failed to get OpenGL function: %s", real_func_name.c_str())
6463
return nullptr;
6564
}
6665

0 commit comments

Comments
 (0)