Fix for broken compilation.

This commit is contained in:
Rinnegatamante
2020-10-26 14:07:19 +01:00
parent ab576f1859
commit 7e74ebce23
7 changed files with 24 additions and 9 deletions
+2
View File
@@ -18,6 +18,8 @@ extern "C"{
#include "rwgl3shader.h" #include "rwgl3shader.h"
#include "rwgl3impl.h" #include "rwgl3impl.h"
#include "psp2_shaders.h"
#define PLUGIN_ID 0 #define PLUGIN_ID 0
uint16_t *gIndicesIm2DPtr; uint16_t *gIndicesIm2DPtr;
+2
View File
@@ -15,6 +15,8 @@
#include "rwgl3impl.h" #include "rwgl3impl.h"
#include "rwgl3shader.h" #include "rwgl3shader.h"
#include "psp2_shaders.h"
extern float *gVertexBufferIm2D; extern float *gVertexBufferIm2D;
extern uint16_t *gIndicesIm2D; extern uint16_t *gIndicesIm2D;
extern float *gVertexBufferIm3D; extern float *gVertexBufferIm3D;
+2
View File
@@ -18,6 +18,8 @@
#include "rwgl3impl.h" #include "rwgl3impl.h"
#include "psp2_shaders.h"
namespace rw { namespace rw {
namespace gl3 { namespace gl3 {
+2
View File
@@ -16,6 +16,7 @@
namespace rw { namespace rw {
namespace gl3 { namespace gl3 {
#ifdef PSP2_USE_SHADER_COMPILER
#ifdef RW_GLES2 #ifdef RW_GLES2
#include "gl2_shaders/header_vs.inc" #include "gl2_shaders/header_vs.inc"
#include "gl2_shaders/header_fs.inc" #include "gl2_shaders/header_fs.inc"
@@ -23,6 +24,7 @@ namespace gl3 {
#include "shaders/header_vs.inc" #include "shaders/header_vs.inc"
#include "shaders/header_fs.inc" #include "shaders/header_fs.inc"
#endif #endif
#endif
UniformRegistry uniformRegistry; UniformRegistry uniformRegistry;
+2
View File
@@ -18,6 +18,8 @@
#include "rwgl3impl.h" #include "rwgl3impl.h"
#include "psp2_shaders.h"
namespace rw { namespace rw {
namespace gl3 { namespace gl3 {
+14
View File
@@ -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
-9
View File
@@ -7,15 +7,6 @@
#ifdef PSP2 #ifdef PSP2
#include <vitasdk.h> #include <vitasdk.h>
#include <vitaGL.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 #else
#ifndef LIBRW_GLAD #ifndef LIBRW_GLAD
#include <GL/glew.h> #include <GL/glew.h>