From b2e6727b255b5ca350c189fd74addab9028acb25 Mon Sep 17 00:00:00 2001
From: jackun <jack.un@gmail.com>
Date: Wed, 1 Apr 2020 15:02:56 +0300
Subject: [PATCH] [OpenGL] Rename loader_gl.* to loader_glx.*

---
 src/gl/inject_glx.cpp                         | 2 +-
 src/loaders/{loader_gl.cpp => loader_glx.cpp} | 2 +-
 src/loaders/{loader_gl.h => loader_glx.h}     | 0
 src/meson.build                               | 3 +--
 4 files changed, 3 insertions(+), 4 deletions(-)
 rename src/loaders/{loader_gl.cpp => loader_glx.cpp} (98%)
 rename src/loaders/{loader_gl.h => loader_glx.h} (100%)

diff --git a/src/gl/inject_glx.cpp b/src/gl/inject_glx.cpp
index e625e6b..cb2dd23 100644
--- a/src/gl/inject_glx.cpp
+++ b/src/gl/inject_glx.cpp
@@ -3,7 +3,7 @@
 #include <array>
 #include <cstring>
 #include "real_dlsym.h"
-#include "loaders/loader_gl.h"
+#include "loaders/loader_glx.h"
 #include "imgui_hud.h"
 #include "mesa/util/macros.h"
 #include "mesa/util/os_time.h"
diff --git a/src/loaders/loader_gl.cpp b/src/loaders/loader_glx.cpp
similarity index 98%
rename from src/loaders/loader_gl.cpp
rename to src/loaders/loader_glx.cpp
index c56424c..ede4226 100644
--- a/src/loaders/loader_gl.cpp
+++ b/src/loaders/loader_glx.cpp
@@ -1,5 +1,5 @@
 #include "real_dlsym.h"
-#include "loaders/loader_gl.h"
+#include "loaders/loader_glx.h"
 
 gl_loader::gl_loader() : loaded_(false) {
 }
diff --git a/src/loaders/loader_gl.h b/src/loaders/loader_glx.h
similarity index 100%
rename from src/loaders/loader_gl.h
rename to src/loaders/loader_glx.h
diff --git a/src/meson.build b/src/meson.build
index d8f7eb4..7f3f212 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -58,7 +58,6 @@ vklayer_files = files(
 opengl_files = files(
   'gl/imgui_hud.cpp',
   'gl/imgui_impl_opengl3.cpp',
-  'loaders/loader_gl.cpp',
   'gl/gl3w/GL/gl3w.c',
 )
 
@@ -74,7 +73,7 @@ if get_option('with_x11').enabled()
   pre_args += '-DHAVE_X11'
   opengl_files += files(
     'gl/inject_glx.cpp',
-#    'loaders/loader_glx.cpp',
+    'loaders/loader_glx.cpp',
   )
 endif