Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Libretro port. #10780

Merged
merged 5 commits into from Mar 24, 2018

Conversation

@aliaspider
Copy link
Contributor

commented Mar 24, 2018

No description provided.

@hrydgard

This comment has been minimized.

Copy link
Owner

commented Mar 24, 2018

clang says:

/home/travis/build/hrydgard/ppsspp/libretro/libretro.cpp:429:3: error: multiple conversions from switch condition type 'std::atomic<EmuThreadState>' to an integral or enumeration type

switch (emuThreadState)`

Unfortunately I think you're gonna have to make that one an std::atomic<uint32_t> and cast.

@aliaspider

This comment has been minimized.

Copy link
Contributor Author

commented Mar 24, 2018

I still don't exactly understand that error, but a cast to the enum type does seem to work. let's wait for travis.

LibretroGraphicsContext::Shutdown();
libretro_get_proc_address = nullptr;
#if 0
NativeShutdownGraphics();

This comment has been minimized.

Copy link
@hrydgard

hrydgard Mar 24, 2018

Owner

Nit: Indentation miss.

public:
LibretroD3D9Context() : LibretroHWRenderContext(RETRO_HW_CONTEXT_DIRECT3D, 9) {}
bool Init() override { return false; }
#if 0

This comment has been minimized.

Copy link
@hrydgard

hrydgard Mar 24, 2018

Owner

Can we get rid of all these #if 0 ? Also they're mis-indented.

This comment has been minimized.

Copy link
@aliaspider

aliaspider Mar 24, 2018

Author Contributor

they are just visual reminders about things that need to be added/fixed. I can get rid of them if that's preferred.
I'll fix the indent, I relied too much on clang-format heh.

delete vk;
vk = nullptr;

#if 0

This comment has been minimized.

Copy link
@hrydgard

hrydgard Mar 24, 2018

Owner

Get rid of this.

public:
LibretroVulkanContext() : LibretroHWRenderContext(RETRO_HW_CONTEXT_VULKAN, VK_MAKE_VERSION(1, 0, 18))
{
#if 0

This comment has been minimized.

Copy link
@hrydgard

hrydgard Mar 24, 2018

Owner

Again, why #if 0 ?

@hrydgard
Copy link
Owner

left a comment

Some nits.

draw_->CreatePresets();
}
#endif

This comment has been minimized.

Copy link
@hrydgard

hrydgard Mar 24, 2018

Owner

Here it was #if 0, but you enabled it. Why wasn't it needed before or why is it needed now?

This comment has been minimized.

Copy link
@aliaspider

aliaspider Mar 24, 2018

Author Contributor

that part is just placeholder/deadcode at the moment since there is no D3D support in libretro yet. the main reason it was initially disabled was because the build was missing the thin3d files, but that it isn't the case anymore.

@hrydgard hrydgard merged commit 2a56519 into hrydgard:master Mar 24, 2018

1 of 2 checks passed

continuous-integration/appveyor/pr Waiting for AppVeyor build to complete
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@hrydgard

This comment has been minimized.

Copy link
Owner

commented Mar 24, 2018

And it's upstream!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.