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

Software backend: Delete forked PixelEngine. #224

Merged
merged 2 commits into from Apr 11, 2014

Conversation

magumagu
Copy link
Contributor

Mostly just zapping a bunch of duplicated code; the only interesting thing
going on here is the changes to the performance counter implementation.

My rough testing shows I didn't break anything, but I don't know how to test the performance counters.

@pauldacheez
Copy link
Contributor

IIRC, performance counters are disabled by default (woo, .ini options hiding things from developers) in every game except Super Mario Sunshine, where they're used in that one "Scrubbing Sirena Beach" level to determine how much goop you've washed away. If you can finish that level normally (e.g. not instantly, which was the result way back when), you can probably assume you didn't break them.

@neobrain
Copy link
Member

@pauldacheez It may also be the case that the level lasts indefinitely and cannot be completed in the given time frame.

@@ -378,7 +381,7 @@ void VideoSoftware::RegisterCPMMIO(MMIO::Mapping* mmio, u32 base)

void VideoSoftware::RegisterPEMMIO(MMIO::Mapping* mmio, u32 base)
{
SWPixelEngine::RegisterMMIO(mmio, base);

This comment was marked as off-topic.

Mostly just zapping a bunch of duplicated code; the only interesting thing
going on here is the changes to the performance counter implementation.
@magumagu
Copy link
Contributor Author

magumagu commented Apr 4, 2014

I think I've addressed all the review comments here.

@delroth
Copy link
Member

delroth commented Apr 4, 2014

@neobrain I'll let you merge this one.

@@ -51,4 +51,17 @@
void BypassXFB(u8* texture, u32 fbWidth, u32 fbHeight, const EFBRectangle& sourceRc, float Gamma);

void DoState(PointerWrap &p);

extern u32 perf_values[PQ_NUM_MEMBERS];
inline void IncPerfCounterQuadCount(PerfQueryType type) {

This comment was marked as off-topic.

@magumagu
Copy link
Contributor Author

magumagu commented Apr 9, 2014

Any other review comments?

@Sonicadvance1
Copy link
Contributor

LGTM

neobrain added a commit that referenced this pull request Apr 11, 2014
Software backend: Delete forked PixelEngine.
@neobrain neobrain merged commit 306b9af into dolphin-emu:master Apr 11, 2014
@neobrain
Copy link
Member

I'd have preferred Super Mario Sunshine to be tested with the software renderer and/or a perf counter hardware test to be written, but alas - the chances of this breaking something look low enough to nod this through. If you're bored one day I highly welcome hardware tests for the feature, though ;)

@magumagu magumagu deleted the swrender-deletepixelfork branch April 11, 2014 20:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
6 participants