From af5d7e2c49d1cfe470b0b4ebd55561f9f22dc677 Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Wed, 26 Dec 2018 01:57:14 -0300
Subject: [PATCH] video_core: Rename glsl_decompiler to gl_shader_decompiler

---
 src/video_core/CMakeLists.txt                                 | 4 ++--
 src/video_core/renderer_opengl/gl_shader_cache.cpp            | 2 +-
 src/video_core/renderer_opengl/gl_shader_cache.h              | 2 +-
 .../gl_shader_decompiler.cpp}                                 | 2 +-
 .../gl_shader_decompiler.h}                                   | 0
 src/video_core/renderer_opengl/gl_shader_gen.cpp              | 2 +-
 src/video_core/renderer_opengl/gl_shader_gen.h                | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
 rename src/video_core/{shader/glsl_decompiler.cpp => renderer_opengl/gl_shader_decompiler.cpp} (99%)
 rename src/video_core/{shader/glsl_decompiler.h => renderer_opengl/gl_shader_decompiler.h} (100%)

diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt
index d767fe77dc..509ca117a1 100644
--- a/src/video_core/CMakeLists.txt
+++ b/src/video_core/CMakeLists.txt
@@ -42,6 +42,8 @@ add_library(video_core STATIC
     renderer_opengl/gl_resource_manager.h
     renderer_opengl/gl_shader_cache.cpp
     renderer_opengl/gl_shader_cache.h
+    renderer_opengl/gl_shader_decompiler.cpp
+    renderer_opengl/gl_shader_decompiler.h
     renderer_opengl/gl_shader_gen.cpp
     renderer_opengl/gl_shader_gen.h
     renderer_opengl/gl_shader_manager.cpp
@@ -83,8 +85,6 @@ add_library(video_core STATIC
     shader/decode/xmad.cpp
     shader/decode/other.cpp
     shader/decode.cpp
-    shader/glsl_decompiler.cpp
-    shader/glsl_decompiler.h
     shader/shader_ir.cpp
     shader/shader_ir.h
     surface.cpp
diff --git a/src/video_core/renderer_opengl/gl_shader_cache.cpp b/src/video_core/renderer_opengl/gl_shader_cache.cpp
index e5435d7333..b3aca39aff 100644
--- a/src/video_core/renderer_opengl/gl_shader_cache.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_cache.cpp
@@ -10,9 +10,9 @@
 #include "video_core/engines/maxwell_3d.h"
 #include "video_core/renderer_opengl/gl_rasterizer.h"
 #include "video_core/renderer_opengl/gl_shader_cache.h"
+#include "video_core/renderer_opengl/gl_shader_decompiler.h"
 #include "video_core/renderer_opengl/gl_shader_manager.h"
 #include "video_core/renderer_opengl/utils.h"
-#include "video_core/shader/glsl_decompiler.h"
 #include "video_core/shader/shader_ir.h"
 
 namespace OpenGL {
diff --git a/src/video_core/renderer_opengl/gl_shader_cache.h b/src/video_core/renderer_opengl/gl_shader_cache.h
index aad1cf6be2..e0887dd7b0 100644
--- a/src/video_core/renderer_opengl/gl_shader_cache.h
+++ b/src/video_core/renderer_opengl/gl_shader_cache.h
@@ -12,8 +12,8 @@
 #include "common/common_types.h"
 #include "video_core/rasterizer_cache.h"
 #include "video_core/renderer_opengl/gl_resource_manager.h"
+#include "video_core/renderer_opengl/gl_shader_decompiler.h"
 #include "video_core/renderer_opengl/gl_shader_gen.h"
-#include "video_core/shader/glsl_decompiler.h"
 
 namespace OpenGL {
 
diff --git a/src/video_core/shader/glsl_decompiler.cpp b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp
similarity index 99%
rename from src/video_core/shader/glsl_decompiler.cpp
rename to src/video_core/renderer_opengl/gl_shader_decompiler.cpp
index 27f1e0ddea..4ded510744 100644
--- a/src/video_core/shader/glsl_decompiler.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp
@@ -12,7 +12,7 @@
 #include "common/assert.h"
 #include "common/common_types.h"
 #include "video_core/engines/maxwell_3d.h"
-#include "video_core/shader/glsl_decompiler.h"
+#include "video_core/renderer_opengl/gl_shader_decompiler.h"
 #include "video_core/shader/shader_ir.h"
 
 namespace OpenGL::GLShader {
diff --git a/src/video_core/shader/glsl_decompiler.h b/src/video_core/renderer_opengl/gl_shader_decompiler.h
similarity index 100%
rename from src/video_core/shader/glsl_decompiler.h
rename to src/video_core/renderer_opengl/gl_shader_decompiler.h
diff --git a/src/video_core/renderer_opengl/gl_shader_gen.cpp b/src/video_core/renderer_opengl/gl_shader_gen.cpp
index 9fb2f9acec..a3f39152c9 100644
--- a/src/video_core/renderer_opengl/gl_shader_gen.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_gen.cpp
@@ -5,8 +5,8 @@
 #include <fmt/format.h>
 #include "common/assert.h"
 #include "video_core/engines/maxwell_3d.h"
+#include "video_core/renderer_opengl/gl_shader_decompiler.h"
 #include "video_core/renderer_opengl/gl_shader_gen.h"
-#include "video_core/shader/glsl_decompiler.h"
 #include "video_core/shader/shader_ir.h"
 
 namespace OpenGL::GLShader {
diff --git a/src/video_core/renderer_opengl/gl_shader_gen.h b/src/video_core/renderer_opengl/gl_shader_gen.h
index b14bdb29c8..ac5e6917b6 100644
--- a/src/video_core/renderer_opengl/gl_shader_gen.h
+++ b/src/video_core/renderer_opengl/gl_shader_gen.h
@@ -10,7 +10,7 @@
 
 #include "common/common_types.h"
 #include "video_core/engines/shader_bytecode.h"
-#include "video_core/shader/glsl_decompiler.h"
+#include "video_core/renderer_opengl/gl_shader_decompiler.h"
 #include "video_core/shader/shader_ir.h"
 
 namespace OpenGL::GLShader {