Enable hardware gpu

Author: ethanaobrien

Common/GPU/OpenGL/GLCommon.h

@@ -5,6 +5,10 @@
 #if PPSSPP_PLATFORM(IOS)
 #include <OpenGLES/ES3/gl.h>
 #include <OpenGLES/ES3/glext.h>
+#elif defined(__EMSCRIPTEN__)
+#include <GLES3/gl3.h>
+#include <GLES2/gl2ext.h>
+#define GL_BGRA_EXT 0x80E1
 #elif defined(USING_GLES2)
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>

Common/GPU/OpenGL/GLMemory.cpp

@@ -32,7 +32,7 @@ void *GLRBuffer::Map(GLBufferStrategy strategy) {
 			if (!hasStorage_) {
 				GLbitfield storageFlags = access & ~(GL_MAP_INVALIDATE_BUFFER_BIT | GL_MAP_FLUSH_EXPLICIT_BIT);
 #ifdef USING_GLES2
-#ifdef GL_EXT_buffer_storage
+#if defined(GL_EXT_buffer_storage) && !defined(__EMSCRIPTEN__)
 				glBufferStorageEXT(target_, size_, nullptr, storageFlags);
 #endif
 #else

Common/GPU/OpenGL/GLProfiler.cpp

@@ -121,8 +121,10 @@ void GLProfiler::BeginFrame() {
 			}
 
 			GLuint64 startTime = 0, endTime = 0;
+#ifndef __EMSCRIPTEN__
 			glGetQueryObjectui64v(queries_[scope.startQueryId], GL_QUERY_RESULT, &startTime);
 			glGetQueryObjectui64v(queries_[scope.endQueryId], GL_QUERY_RESULT, &endTime);
+#endif
 
 			// Times are in nanoseconds, convert to milliseconds
 			double milliseconds = (double)(endTime - startTime) / 1000000.0;
@@ -154,7 +156,9 @@ void GLProfiler::Begin(const char *fmt, ...) {
 	scopeStack_.push_back(scopes_.size());
 	scopes_.push_back(scope);
 
+#ifndef __EMSCRIPTEN__
 	glQueryCounter(queries_[numQueries_], GL_TIMESTAMP);
+#endif
 	numQueries_++;
 }
 
@@ -174,6 +178,8 @@ void GLProfiler::End() {
 	GLProfilerScope &scope = scopes_[scopeId];
 	scope.endQueryId = numQueries_;
 
+#ifndef __EMSCRIPTEN__
 	glQueryCounter(queries_[numQueries_], GL_TIMESTAMP);
+#endif
 	numQueries_++;
 }

Common/GPU/OpenGL/GLQueueRunner.cpp

@@ -214,7 +214,7 @@ void GLQueueRunner::RunInitSteps(const FastVec<GLRInitStep> &steps, bool skipGLC
 			} else if (gl_extensions.VersionGEThan(3, 0, 0)) {
 				glBindFragDataLocation(program->program, 0, "fragColor0");
 			}
-#elif !PPSSPP_PLATFORM(IOS)
+#elif !PPSSPP_PLATFORM(IOS) && !defined(__EMSCRIPTEN__)
 			if (gl_extensions.GLES3 && step.create_program.support_dual_source) {
 				// For GLES2, we use gl_SecondaryFragColorEXT as fragColor1.
 				_dbg_assert_msg_(gl_extensions.EXT_blend_func_extended, "EXT_blend_func_extended required for dual src");
@@ -1477,7 +1477,7 @@ void GLQueueRunner::PerformCopy(const GLRStep &step) {
 	_assert_msg_(caps_.framebufferCopySupported, "Image copy extension expected");
 
 #if defined(USING_GLES2)
-#if !PPSSPP_PLATFORM(IOS)
+#if !PPSSPP_PLATFORM(IOS) && !defined(__EMSCRIPTEN__)
 	glCopyImageSubDataOES(
 		srcTex, target, srcLevel, srcRect.x, srcRect.y, srcZ,
 		dstTex, target, dstLevel, dstPos.x, dstPos.y, dstZ,

Common/GPU/OpenGL/gl3stub.c

@@ -19,7 +19,7 @@
 #include "Common/GPU/OpenGL/GLCommon.h"
 
 #if defined(USING_GLES2)
-#if !PPSSPP_PLATFORM(IOS)
+#if !PPSSPP_PLATFORM(IOS) && !defined(__EMSCRIPTEN__)
 #include "EGL/egl.h"
 
 GLboolean gl3stubInit() {

Common/GPU/OpenGL/gl3stub.h

@@ -47,8 +47,8 @@ extern "C" {
  * otherwise. */
 GLboolean gl3stubInit();
 
-#if !PPSSPP_PLATFORM(IOS)
-    
+#if !PPSSPP_PLATFORM(IOS) && !defined(__EMSCRIPTEN__)
+
 /*-------------------------------------------------------------------------
  * Data type definitions
  *-----------------------------------------------------------------------*/

Common/TimeUtil.cpp

@@ -13,6 +13,7 @@
 
 #ifdef __EMSCRIPTEN__
 #include <emscripten/emscripten.h>
+#include <emscripten/threading.h>
 #endif // __EMSCRIPTEN__
 
 #ifdef _WIN32
@@ -267,7 +268,10 @@ void sleep_ms(int ms, const char *reason) {
 #elif defined(HAVE_LIBNX)
 	svcSleepThread(ms * 1000000);
 #elif defined(__EMSCRIPTEN__)
-	emscripten_sleep(ms);
+	if (emscripten_is_main_browser_thread())
+		emscripten_sleep(ms);
+	else
+		emscripten_thread_sleep(ms);
 #else
 	usleep(ms * 1000);
 #endif
@@ -285,7 +289,10 @@ void sleep_us(int us, const char *reason) {
 #elif defined(HAVE_LIBNX)
 	svcSleepThread(us * 1000);
 #elif defined(__EMSCRIPTEN__)
-	emscripten_sleep(us / 1000);
+	if (emscripten_is_main_browser_thread())
+		emscripten_sleep(us / 1000);
+	else
+		emscripten_thread_sleep(us / 1000);
 #else
 	usleep(us);
 #endif
@@ -342,7 +349,10 @@ void sleep_precise(double seconds, const char *reason) {
 #elif defined(HAVE_LIBNX)
 	svcSleepThread((int64_t)(seconds * 1000000000.0));
 #elif defined(__EMSCRIPTEN__)
-	emscripten_sleep(seconds * 1000.0);
+	if (emscripten_is_main_browser_thread())
+		emscripten_sleep((unsigned int)(seconds * 1000.0));
+	else
+		emscripten_thread_sleep(seconds * 1000.0);
 #else
 	usleep(seconds * 1000000.0);
 #endif

Core/HLE/sceDisplay.cpp

@@ -455,12 +455,17 @@ static void DoFrameTiming(bool throttle, bool *skipFrame, float scaledTimestep,
 			// Wait until we've caught up.
 			// If we're ending the frame here, we'll defer the sleep until after the command buffers
 			// have been handed off to the render thread, for some more overlap.
+#ifdef __EMSCRIPTEN__
+			WaitUntil(curFrameTime, nextFrameTime, "display-wait");
+			curFrameTime = time_now_d();
+#else
 			if (endOfFrame) {
 				g_frameTiming.DeferWaitUntil(nextFrameTime, &curFrameTime);
 			} else {
 				WaitUntil(curFrameTime, nextFrameTime, "display-wait");
 				curFrameTime = time_now_d();  // I guess we could also just set it to nextFrameTime...
 			}
+#endif
 		}
 	}
 

libretro/LibretroGLContext.h

@@ -7,7 +7,9 @@
 class LibretroGLContext : public LibretroHWRenderContext {
 public:
 	LibretroGLContext()
-#ifdef USING_GLES2
+#ifdef __EMSCRIPTEN__
+		: LibretroHWRenderContext(RETRO_HW_CONTEXT_OPENGLES3, 3, 0)
+#elif defined(USING_GLES2)
 		: LibretroHWRenderContext(RETRO_HW_CONTEXT_OPENGLES2)
 #else
 		: LibretroHWRenderContext(RETRO_HW_CONTEXT_OPENGL)

libretro/Makefile

@@ -425,7 +425,7 @@ endif
 include Makefile.common
 
 ifeq ($(GLES), 1)
-	GLFLAGS += -DGLES # -DUSING_GLES2
+	GLFLAGS += -DGLES -DUSING_GLES2
 else
 	GLFLAGS += -DHAVE_OPENGL
 endif