Permalink
Browse files

Merge pull request #441 from Gillou68310/video-gln64

video-gln64: Remove ae-bridge dependency
  • Loading branch information...
littleguy77 committed Jun 1, 2015
2 parents 6ff8c0e + 1d96af6 commit 97d8fc486a4469067089206b8af180d978555349
@@ -50,9 +50,6 @@ extern void Android_JNI_InitImports(JNIEnv* env, jclass cls);
// Called by mupen64plus-ui-console
extern void Android_JNI_StateCallback(void* context, m64p_core_param paramChanged, int newValue);
-// Called by mupen64plus-video-gln64
-extern void Android_JNI_SwapWindow();
-
#ifdef __cplusplus
}
#endif
@@ -24,14 +24,13 @@ include $(CLEAR_VARS)
SRCDIR := src
LOCAL_MODULE := mupen64plus-video-gln64
-LOCAL_SHARED_LIBRARIES := ae-imports SDL2
+LOCAL_SHARED_LIBRARIES := SDL2
LOCAL_STATIC_LIBRARIES := cpufeatures
LOCAL_ARM_MODE := arm
LOCAL_C_INCLUDES := \
$(M64P_API_INCLUDES) \
$(SDL_INCLUDES) \
- $(AE_BRIDGE_INCLUDES) \
LOCAL_SRC_FILES := \
$(SRCDIR)/2xSAI.cpp \
@@ -32,8 +32,6 @@
#include "FrameSkipper.h"
-#include "ae_imports.h"
-
//// paulscode, function prototype missing from Yongzh's code
void OGL_UpdateDepthUpdate();
////
@@ -316,7 +314,7 @@ bool OGL_Start()
glClearColor( 0, 0, 0, 1 );
glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
glFinish();
- Android_JNI_SwapWindow(); // paulscode, fix for black-screen bug
+ SDL_GL_SwapBuffers(); // paulscode, fix for black-screen bug
glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
glFinish();
OGL_UpdateDepthUpdate();
@@ -1274,7 +1272,7 @@ void OGL_SwapBuffers()
glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, 4 * sizeof(float), (float*)vert + 2);
glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
- Android_JNI_SwapWindow(); // paulscode, fix for black-screen bug
+ SDL_GL_SwapBuffers(); // paulscode, fix for black-screen bug
glBindFramebuffer(GL_FRAMEBUFFER, OGL.framebuffer.fb);
OGL_UpdateViewport();
@@ -1283,7 +1281,7 @@ void OGL_SwapBuffers()
}
else
{
- Android_JNI_SwapWindow(); // paulscode, fix for black-screen bug
+ SDL_GL_SwapBuffers(); // paulscode, fix for black-screen bug
}
// if emulator defined a render callback function, call it before
@@ -20,8 +20,6 @@
#include "FrameSkipper.h"
#include "ticks.h"
-#include "ae_imports.h"
-
ptr_ConfigGetSharedDataFilepath ConfigGetSharedDataFilepath = NULL;
static FrameSkipper frameSkipper;

0 comments on commit 97d8fc4

Please sign in to comment.