Merge pull request #16355 from hrydgard/vr-gl-buildfix

Properly buildfix GL/VR again

Common/VR/PPSSPPVR.cpp

@@ -1,12 +1,14 @@
 #include "Common/VR/PPSSPPVR.h"
+
 #include "Common/VR/VRBase.h"
+#if XR_USE_GRAPHICS_API_OPENGL || XR_USE_GRAPHICS_API_OPENGL_ES
+#include "Common/GPU/OpenGL/GLRenderManager.h"
+#endif
+
 #include "Common/VR/VRInput.h"
 #include "Common/VR/VRMath.h"
 #include "Common/VR/VRRenderer.h"
 
-#if XR_USE_GRAPHICS_API_OPENGL || XR_USE_GRAPHICS_API_OPENGL_ES
-#include "Common/GPU/OpenGL/GLRenderManager.h"
-#endif
 #include "Common/GPU/Vulkan/VulkanContext.h"
 
 #include "Core/HLE/sceDisplay.h"

Common/VR/VRBase.h

@@ -15,42 +15,9 @@
 #define _USE_MATH_DEFINES
 #include <cmath>
 
-#ifdef ANDROID
+#if defined(_DEBUG) && (defined(XR_USE_GRAPHICS_API_OPENGL) || defined(XR_USE_GRAPHICS_API_OPENGL_ES))
 
-#include <GLES3/gl3.h>
-#include <GLES3/gl3ext.h>
-
-#endif
-
-#if defined(_DEBUG) && defined(ANDROID)
-static const char* GlErrorString(GLenum error) {
-	switch (error) {
-		case GL_NO_ERROR:
-			return "GL_NO_ERROR";
-		case GL_INVALID_ENUM:
-			return "GL_INVALID_ENUM";
-		case GL_INVALID_VALUE:
-			return "GL_INVALID_VALUE";
-		case GL_INVALID_OPERATION:
-			return "GL_INVALID_OPERATION";
-		case GL_INVALID_FRAMEBUFFER_OPERATION:
-			return "GL_INVALID_FRAMEBUFFER_OPERATION";
-		case GL_OUT_OF_MEMORY:
-			return "GL_OUT_OF_MEMORY";
-		default:
-			return "unknown";
-	}
-}
-
-static void GLCheckErrors(char* file, int line) {
-	for (int i = 0; i < 10; i++) {
-		const GLenum error = glGetError();
-		if (error == GL_NO_ERROR) {
-			break;
-		}
-		ALOGE("GL error on line %s:%d %s", file, line, GlErrorString(error));
-	}
-}
+void GLCheckErrors(char* file, int line);
 
 #define GL(func) func; GLCheckErrors(__FILE__ , __LINE__);
 #else

Common/VR/VRFramebuffer.cpp

@@ -1,5 +1,12 @@
 #include "VRFramebuffer.h"
 
+#if XR_USE_GRAPHICS_API_OPENGL_ES
+
+#include <GLES3/gl3.h>
+#include <GLES3/gl3ext.h>
+
+#endif
+
 #include <cstdio>
 #include <cstdlib>
 #include <cstdbool>
@@ -43,6 +50,39 @@ void ovrFramebuffer_Clear(ovrFramebuffer* frameBuffer) {
 	frameBuffer->Acquired = false;
 }
 
+#if XR_USE_GRAPHICS_API_OPENGL || XR_USE_GRAPHICS_API_OPENGL_ES
+
+static const char* GlErrorString(GLenum error) {
+	switch (error) {
+	case GL_NO_ERROR:
+		return "GL_NO_ERROR";
+	case GL_INVALID_ENUM:
+		return "GL_INVALID_ENUM";
+	case GL_INVALID_VALUE:
+		return "GL_INVALID_VALUE";
+	case GL_INVALID_OPERATION:
+		return "GL_INVALID_OPERATION";
+	case GL_INVALID_FRAMEBUFFER_OPERATION:
+		return "GL_INVALID_FRAMEBUFFER_OPERATION";
+	case GL_OUT_OF_MEMORY:
+		return "GL_OUT_OF_MEMORY";
+	default:
+		return "unknown";
+	}
+}
+
+void GLCheckErrors(char* file, int line) {
+	for (int i = 0; i < 10; i++) {
+		const GLenum error = glGetError();
+		if (error == GL_NO_ERROR) {
+			break;
+		}
+		ALOGE("GL error on line %s:%d %s", file, line, GlErrorString(error));
+	}
+}
+
+#endif
+
 #if XR_USE_GRAPHICS_API_OPENGL_ES
 
 static bool ovrFramebuffer_CreateGLES(XrSession session, ovrFramebuffer* frameBuffer, int width, int height, bool multiview) {