Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 13:30:02 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

nits.

Browse Source
This commit is contained in:
aliaspider 2018-03-24 13:39:05 +01:00
parent 0af6d573bb
commit d1711c5aa4
6 changed files with 43 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -52,7 +52,7 @@ set(USE_FFMPEG ON)
# the libraries in the ffmpeg/ directory are not compatible with mingw
if(MINGW AND NOT DEFINED USE_SYSTEM_FFMPEG)
set(USE_SYSTEM_FFMPEG ON)
set(USE_SYSTEM_FFMPEG ON)
endif()
if(NOT ANDROID AND NOT IOS)
@ -139,9 +139,9 @@ endif()
if(LIBRETRO)
add_definitions(-D__LIBRETRO__)
add_definitions(-DGLEW_NO_GLU)
if(NOT MSVC)
add_compile_options(-fPIC)
endif()
if(NOT MSVC)
add_compile_options(-fPIC)
endif()
endif()
if(ANDROID)
@ -293,8 +293,8 @@ else()
endif()
if(WIN32)
add_definitions(-D_UNICODE -DUNICODE)
add_definitions(-DUSING_WIN_UI)
add_definitions(-D_UNICODE -DUNICODE)
add_definitions(-DUSING_WIN_UI)
endif()
if(NOT ANDROID)

4
libretro/LibretroGLContext.cpp
View File

@ -21,10 +21,6 @@ void LibretroGLContext::Shutdown()
{
LibretroGraphicsContext::Shutdown();
libretro_get_proc_address = nullptr;
#if 0
NativeShutdownGraphics();
finalize_glslang();
#endif
}
void LibretroGLContext::CreateDrawContext()

28
libretro/LibretroGraphicsContext.h
View File

@ -71,13 +71,13 @@ class LibretroD3D9Context : public LibretroHWRenderContext {
public:
LibretroD3D9Context() : LibretroHWRenderContext(RETRO_HW_CONTEXT_DIRECT3D, 9) {}
bool Init() override { return false; }
#if 0
void InitDrawContext() override
{
draw_ = Draw::T3DCreateDX9Context();
draw_->CreatePresets();
}
#endif
void InitDrawContext() override
{
draw_ = Draw::T3DCreateDX9Context();
draw_->CreatePresets();
}
GPUCore GetGPUCore() override { return GPUCORE_DIRECTX9; }
const char *Ident() override { return "DirectX 9"; }
};
@ -86,13 +86,13 @@ class LibretroD3D11Context : public LibretroHWRenderContext {
public:
LibretroD3D11Context() : LibretroHWRenderContext(RETRO_HW_CONTEXT_DIRECT3D, 11) {}
bool Init() override { return false; }
#if 0
void InitDrawContext() override
{
draw_ = Draw::T3DCreateD3D11Context();
draw_->CreatePresets();
}
#endif
void InitDrawContext() override
{
draw_ = Draw::T3DCreateD3D11Context();
draw_->CreatePresets();
}
GPUCore GetGPUCore() override { return GPUCORE_DIRECTX11; }
const char *Ident() override { return "DirectX 11"; }
};

3
libretro/LibretroVulkanContext.cpp
View File

@ -127,9 +127,6 @@ void LibretroVulkanContext::Shutdown()
delete vk;
vk = nullptr;
#if 0
NativeShutdownGraphics();
#endif
finalize_glslang();
vk_libretro_shutdown();
}

7
libretro/LibretroVulkanContext.h
View File

@ -5,12 +5,7 @@
class LibretroVulkanContext : public LibretroHWRenderContext {
public:
LibretroVulkanContext() : LibretroHWRenderContext(RETRO_HW_CONTEXT_VULKAN, VK_MAKE_VERSION(1, 0, 18))
{
#if 0
hw_render_.cache_context = true;
#endif
}
LibretroVulkanContext() : LibretroHWRenderContext(RETRO_HW_CONTEXT_VULKAN, VK_MAKE_VERSION(1, 0, 18)) {}
~LibretroVulkanContext() override {}
bool Init() override;
void Shutdown() override;

44
libretro/libretro.cpp
View File

@ -327,7 +327,7 @@ void retro_set_input_state(retro_input_state_t cb) { input_state_cb = cb; }
void retro_init(void)
{
#if 0
g_Config.Load("");
g_Config.Load("");
#endif
g_Config.bEnableLogging = true;
@ -587,7 +587,7 @@ bool retro_load_game(const struct retro_game_info *game)
check_variables(coreParam);
#if 0
g_Config.bVertexDecoderJit = (coreParam.cpuCore == CPU_JIT) ? true : false;
g_Config.bVertexDecoderJit = (coreParam.cpuCore == CPU_JIT) ? true : false;
#endif
std::string error_string;
@ -620,12 +620,12 @@ void retro_reset(void)
PSP_Shutdown();
#if 0
coreState = CORE_POWERUP;
if(!PSP_InitStart(PSP_CoreParameter(), &error_string))
{
ERROR_LOG(BOOT, "%s", error_string.c_str());
environ_cb(RETRO_ENVIRONMENT_SHUTDOWN, nullptr);
}
coreState = CORE_POWERUP;
if(!PSP_InitStart(PSP_CoreParameter(), &error_string))
{
ERROR_LOG(BOOT, "%s", error_string.c_str());
environ_cb(RETRO_ENVIRONMENT_SHUTDOWN, nullptr);
}
#else
if (!PSP_Init(PSP_CoreParameter(), &error_string))
{
@ -644,17 +644,17 @@ static void retro_input(void)
u32 sceCtrl;
} map[] = {
{ RETRO_DEVICE_ID_JOYPAD_UP, CTRL_UP },
{ RETRO_DEVICE_ID_JOYPAD_DOWN, CTRL_DOWN },
{ RETRO_DEVICE_ID_JOYPAD_LEFT, CTRL_LEFT },
{ RETRO_DEVICE_ID_JOYPAD_RIGHT, CTRL_RIGHT },
{ RETRO_DEVICE_ID_JOYPAD_X, CTRL_TRIANGLE },
{ RETRO_DEVICE_ID_JOYPAD_A, CTRL_CIRCLE },
{ RETRO_DEVICE_ID_JOYPAD_B, CTRL_CROSS },
{ RETRO_DEVICE_ID_JOYPAD_Y, CTRL_SQUARE },
{ RETRO_DEVICE_ID_JOYPAD_L, CTRL_LTRIGGER },
{ RETRO_DEVICE_ID_JOYPAD_R, CTRL_RTRIGGER },
{ RETRO_DEVICE_ID_JOYPAD_START, CTRL_START },
{ RETRO_DEVICE_ID_JOYPAD_SELECT, CTRL_SELECT },
{ RETRO_DEVICE_ID_JOYPAD_DOWN, CTRL_DOWN },
{ RETRO_DEVICE_ID_JOYPAD_LEFT, CTRL_LEFT },
{ RETRO_DEVICE_ID_JOYPAD_RIGHT, CTRL_RIGHT },
{ RETRO_DEVICE_ID_JOYPAD_X, CTRL_TRIANGLE },
{ RETRO_DEVICE_ID_JOYPAD_A, CTRL_CIRCLE },
{ RETRO_DEVICE_ID_JOYPAD_B, CTRL_CROSS },
{ RETRO_DEVICE_ID_JOYPAD_Y, CTRL_SQUARE },
{ RETRO_DEVICE_ID_JOYPAD_L, CTRL_LTRIGGER },
{ RETRO_DEVICE_ID_JOYPAD_R, CTRL_RTRIGGER },
{ RETRO_DEVICE_ID_JOYPAD_START, CTRL_START },
{ RETRO_DEVICE_ID_JOYPAD_SELECT, CTRL_SELECT },
};
// clang-format on
@ -678,10 +678,10 @@ void retro_run(void)
{
std::string error_string;
#if 0
if(!PSP_InitUpdate(&error_string))
if(!PSP_InitUpdate(&error_string))
{
graphics_context->SwapBuffers();
return;
graphics_context->SwapBuffers();
return;
}
#else
while (!PSP_InitUpdate(&error_string))