From 7e74ebce239adf245d082ef7964f70d26b020db8 Mon Sep 17 00:00:00 2001
From: Rinnegatamante <rinnegatamante@gmail.com>
Date: Mon, 26 Oct 2020 14:07:19 +0100
Subject: [PATCH] Fix for broken compilation.

---
 src/gl/gl3device.cpp  |  2 ++
 src/gl/gl3immed.cpp   |  2 ++
 src/gl/gl3matfx.cpp   |  2 ++
 src/gl/gl3shader.cpp  |  2 ++
 src/gl/gl3skin.cpp    |  2 ++
 src/gl/psp2_shaders.h | 14 ++++++++++++++
 src/gl/rwgl3.h        |  9 ---------
 7 files changed, 24 insertions(+), 9 deletions(-)
 create mode 100644 src/gl/psp2_shaders.h

diff --git a/src/gl/gl3device.cpp b/src/gl/gl3device.cpp
index 524872c..daca31a 100644
--- a/src/gl/gl3device.cpp
+++ b/src/gl/gl3device.cpp
@@ -18,6 +18,8 @@ extern "C"{
 #include "rwgl3shader.h"
 #include "rwgl3impl.h"
 
+#include "psp2_shaders.h"
+
 #define PLUGIN_ID 0
 
 uint16_t *gIndicesIm2DPtr;
diff --git a/src/gl/gl3immed.cpp b/src/gl/gl3immed.cpp
index 8be9bde..8708fe3 100644
--- a/src/gl/gl3immed.cpp
+++ b/src/gl/gl3immed.cpp
@@ -15,6 +15,8 @@
 #include "rwgl3impl.h"
 #include "rwgl3shader.h"
 
+#include "psp2_shaders.h"
+
 extern float *gVertexBufferIm2D;
 extern uint16_t *gIndicesIm2D;
 extern float *gVertexBufferIm3D;
diff --git a/src/gl/gl3matfx.cpp b/src/gl/gl3matfx.cpp
index cae9e0f..bd47dcf 100644
--- a/src/gl/gl3matfx.cpp
+++ b/src/gl/gl3matfx.cpp
@@ -18,6 +18,8 @@
 
 #include "rwgl3impl.h"
 
+#include "psp2_shaders.h"
+
 namespace rw {
 namespace gl3 {
 
diff --git a/src/gl/gl3shader.cpp b/src/gl/gl3shader.cpp
index 37e74e8..b095284 100644
--- a/src/gl/gl3shader.cpp
+++ b/src/gl/gl3shader.cpp
@@ -16,6 +16,7 @@
 namespace rw {
 namespace gl3 {
 
+#ifdef PSP2_USE_SHADER_COMPILER
 #ifdef RW_GLES2
 #include "gl2_shaders/header_vs.inc"
 #include "gl2_shaders/header_fs.inc"
@@ -23,6 +24,7 @@ namespace gl3 {
 #include "shaders/header_vs.inc"
 #include "shaders/header_fs.inc"
 #endif
+#endif
 
 UniformRegistry uniformRegistry;
 
diff --git a/src/gl/gl3skin.cpp b/src/gl/gl3skin.cpp
index 7dd641b..24e180f 100644
--- a/src/gl/gl3skin.cpp
+++ b/src/gl/gl3skin.cpp
@@ -18,6 +18,8 @@
 
 #include "rwgl3impl.h"
 
+#include "psp2_shaders.h"
+
 namespace rw {
 namespace gl3 {
 
diff --git a/src/gl/psp2_shaders.h b/src/gl/psp2_shaders.h
new file mode 100644
index 0000000..a5e1e00
--- /dev/null
+++ b/src/gl/psp2_shaders.h
@@ -0,0 +1,14 @@
+#ifndef _PSP2_SHADERS_
+#define _PSP2_SHADERS_
+
+#ifndef PSP2_USE_SHADER_COMPILER
+#include "shaders/default_v.h"
+#include "shaders/skin_v.h"
+#include "shaders/im3d_v.h"
+#include "shaders/im2d_v.h"
+#include "shaders/matfx_env_v.h"
+#include "shaders/matfx_env_f.h"
+#include "shaders/simple_f.h"
+#endif
+
+#endif
diff --git a/src/gl/rwgl3.h b/src/gl/rwgl3.h
index 4b29024..ccaba26 100644
--- a/src/gl/rwgl3.h
+++ b/src/gl/rwgl3.h
@@ -7,15 +7,6 @@
 #ifdef PSP2
 #include <vitasdk.h>
 #include <vitaGL.h>
-#ifndef PSP2_USE_SHADER_COMPILER
-#include "shaders/default_v.h"
-#include "shaders/im3d_v.h"
-#include "shaders/im2d_v.h"
-#include "shaders/skin_v.h"
-#include "shaders/matfx_env_v.h"
-#include "shaders/matfx_env_f.h"
-#include "shaders/simple_f.h"
-#endif
 #else
 #ifndef LIBRW_GLAD
 #include <GL/glew.h>