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

Fix XFB scaling in D3D #1208

Closed
wants to merge 10 commits into from
Closed

Fix XFB scaling in D3D #1208

wants to merge 10 commits into from

Conversation

slx7R4GDZM
Copy link
Contributor

Fixes issue 7681.

@lioncash
Copy link
Member

lioncash commented Oct 2, 2014

ping @neobrain and @degasus. Can you guys take a look at this?

@skidau
Copy link
Contributor

skidau commented Oct 2, 2014

@dolphin-emu-bot rebuild

@Linktothepast
Copy link
Contributor

From some testing it seems to work ok here with direct 3d and The Legend of Zelda: Collector's Edition.

@JMC47
Copy link
Contributor

JMC47 commented Oct 2, 2014

Same here, can confirm Collector's Edition NES games are working in D3D now. Will test the others on my main box where I have the rest of my games.

@JMC47
Copy link
Contributor

JMC47 commented Oct 3, 2014

All of the titles fixed by the OpenGL XFB Scaling are fixed here.

@skidau
Copy link
Contributor

skidau commented Oct 7, 2014

@slx7R4GDZM this PR looks good but needs to be rebased.

@skidau
Copy link
Contributor

skidau commented Oct 7, 2014

Github still says that the PR cannot be automatically merged because of unresolved conflicts.

@skidau
Copy link
Contributor

skidau commented Oct 7, 2014

@slx7R4GDZM you might need to fetch from dolphin-emu/dolphin master first so that you are on the latest before rebasing.

@slx7R4GDZM
Copy link
Contributor Author

Alright, I'll try that in a bit. Never knew the troubles of merge conflicts before, lol.

@JMC47
Copy link
Contributor

JMC47 commented Oct 11, 2014

Once this is rebased, I'm fairly certain it can be merged. Just prodding to make sure you don't need any help!

D3D11_BOX box = CD3D11_BOX(0, 0, 0, width, height, 1);
D3D::context->UpdateSubresource(m_yuyvTexture, 0, &box, yuyvSrc, 2*width, 2*width*height);
D3D11_BOX box = CD3D11_BOX(0, 0, 0, stride, height, 1);
D3D::context->UpdateSubresource(m_yuyvTexture, 0, &box, yuyvSrc, 2 * stride, 2 * stride*height);

This comment was marked as off-topic.

@slx7R4GDZM
Copy link
Contributor Author

Well I fixed the whole multiple commit things but it does look like I'll have to update the repository. Unfortunately when I try to fetch the updates it attempts to fetch them from itself and then obviously says that it's up to date. Any tips?

@BhaaLseN
Copy link
Member

First git fetch upstream (replace upstream with the remote name of dolphin-emu which points to here; check git remote -v if you're not sure) to get master updated, then git rebase upstream/master (again, replace upstream with the right remote name).

@skidau
Copy link
Contributor

skidau commented Oct 14, 2014

@dolphin-emu-bot rebuild

FioraAeterna and others added 3 commits October 13, 2014 22:04
No known games, not even Wii MMU games like Cars 2 and Toy Story 3, use custom
BATs. This makes BAT resolution a waste of time. BAT handling could be
optimized significantly, but as long as nothing uses it, it's easier to just
disable it.

Should significantly improve performance in MMU-heavy games.
@JMC47
Copy link
Contributor

JMC47 commented Oct 14, 2014

The build failed, can you fix the errors and try again? Do you need any help with interfacing with the buildbots?

@slx7R4GDZM
Copy link
Contributor Author

Meh, I think I give up. Somebody can take remake this PR if they want.

@slx7R4GDZM slx7R4GDZM closed this Oct 14, 2014
@JMC47
Copy link
Contributor

JMC47 commented Oct 15, 2014

We can't rebase/fix it up if the fork is gone. Do you still have the code anywhere?

NVM. Points down Not good at this github stuff xD

@waddlesplash
Copy link
Contributor

Yep, in the "changes" tab. Let's see if I can turn that into workable diff...

@lioncash lioncash mentioned this pull request Oct 15, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
9 participants