mirror of
https://github.com/hrydgard/ppsspp.git
synced 2024-10-08 19:43:40 +00:00
Update native + some very minor changes
This commit is contained in:
parent
1533b588e3
commit
a346697037
@ -469,7 +469,6 @@ void CallSyscall(u32 op)
|
||||
int modulenum = (callno & 0xFF000) >> 12;
|
||||
if (funcnum == 0xfff || op == 0xffff)
|
||||
{
|
||||
_dbg_assert_msg_(HLE,0,"Unknown syscall");
|
||||
ERROR_LOG(HLE,"Unknown syscall: Module: %s", modulenum > (int) moduleDB.size() ? "(unknown)" : moduleDB[modulenum].name);
|
||||
return;
|
||||
}
|
||||
|
@ -15,12 +15,13 @@
|
||||
// Official git repository and contact information can be found at
|
||||
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
|
||||
|
||||
#include "gfx_es2/gl_state.h"
|
||||
|
||||
#include "Core/MemMap.h"
|
||||
#include "Core/Host.h"
|
||||
#include "Core/Config.h"
|
||||
#include "Core/Reporting.h"
|
||||
#include "Core/System.h"
|
||||
#include "gfx_es2/gl_state.h"
|
||||
|
||||
#include "../GPUState.h"
|
||||
#include "../ge_constants.h"
|
||||
@ -310,6 +311,16 @@ void GLES_GPU::CopyDisplayToOutput() {
|
||||
|
||||
shaderManager_->EndFrame();
|
||||
|
||||
// If buffered, discard the depth buffer of the backbuffer. Don't even know if we need one.
|
||||
#if 0
|
||||
#ifdef USING_GLES2
|
||||
if (gl_extensions.EXT_discard_framebuffer && g_Config.iRenderingMode != 0) {
|
||||
GLenum attachments[] = {GL_DEPTH_EXT, GL_STENCIL_EXT};
|
||||
glDiscardFramebufferEXT(GL_FRAMEBUFFER, 2, attachments);
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
gstate_c.textureChanged = true;
|
||||
}
|
||||
|
||||
|
@ -3,7 +3,7 @@
|
||||
<classpathentry kind="src" path="src"/>
|
||||
<classpathentry kind="src" path="gen"/>
|
||||
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
|
||||
<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
|
||||
<classpathentry kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
|
||||
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
|
||||
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
|
||||
<classpathentry kind="output" path="bin/classes"/>
|
||||
</classpath>
|
||||
|
@ -26,7 +26,7 @@ LOCAL_MODULE := ppsspp_jni
|
||||
NATIVE := ../../native
|
||||
SRC := ../..
|
||||
|
||||
LOCAL_CFLAGS := -DUSE_FFMPEG -DUSE_PROFILER -DGL_GLEXT_PROTOTYPES -DUSING_GLES2 -O3 -fsigned-char -Wall -Wno-multichar -Wno-psabi -Wno-unused-variable -fno-strict-aliasing -ffast-math
|
||||
LOCAL_CFLAGS := -DUSE_FFMPEG -DUSE_PROFILER -DUSING_GLES2 -O3 -fsigned-char -Wall -Wno-multichar -Wno-psabi -Wno-unused-variable -fno-strict-aliasing -ffast-math
|
||||
# yes, it's really CPPFLAGS for C++
|
||||
LOCAL_CPPFLAGS := -std=gnu++11 -fno-rtti
|
||||
LOCAL_C_INCLUDES := \
|
||||
|
2
native
2
native
@ -1 +1 @@
|
||||
Subproject commit 4871c1192d54adb9be8f642d4c0303cf359104db
|
||||
Subproject commit 5d3f2e8b5d270a7d274b58a68a0c94ee3c9263bf
|
Loading…
Reference in New Issue
Block a user