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

add shaders for anaglyph Amber-Blue and Green-Magenta #2491

Merged
merged 1 commit into from
Jun 2, 2015

Conversation

LenaWil
Copy link
Contributor

@LenaWil LenaWil commented May 31, 2015

@LenaWil
Copy link
Contributor Author

LenaWil commented May 31, 2015

I could only test the G-M because I don't have an Amber-Blue.

@Tilka
Copy link
Member

Tilka commented May 31, 2015

Please drop the merge commit; we won't merge it like this.

@BhaaLseN
Copy link
Member

Are those mat3 supposed to be some sort of aligned? Looks a bit random to me.

@Sonicadvance1
Copy link
Contributor

Are we even able to use these constants? They are copywritten under "All rights reserved" which I think we aren't allowed to distribute without explicit say from the original author to do so, which breaks GPL?

@degasus
Copy link
Member

degasus commented May 31, 2015

Mathematic constants aren't copyright-able, so they are fine.

@degasus
Copy link
Member

degasus commented May 31, 2015

Are those shaders tested on both D3D and OGL? iirc they have some other default meaning of row vs vector based matrices :/

@Tilka
Copy link
Member

Tilka commented Jun 1, 2015

You'll have to rebase, not merge.

@LenaWil
Copy link
Contributor Author

LenaWil commented Jun 1, 2015

I thought I did and I'm sorry for all the garbage. Can I start over?

@Tilka
Copy link
Member

Tilka commented Jun 1, 2015

If you mean open a new PR, there's no need for that. Once you get it right locally, you just need to force-push. If you need help, join #dolphin-dev on freenode.

@LenaWil
Copy link
Contributor Author

LenaWil commented Jun 1, 2015

@Tilka done :)
@degasus the shaders are for and tested on OpenGL. Does the Direct3d backend have support for Post-Processing Effect shaders?
@BhaaLseN It's based on Dubois shader in the same directory.

@Tilka
Copy link
Member

Tilka commented Jun 1, 2015

Can you also fix the alignment?

@Tilka
Copy link
Member

Tilka commented Jun 1, 2015

The way you previously did it was actually the Dolphin Way. It's just that some spaces were missing.

@Tilka
Copy link
Member

Tilka commented Jun 1, 2015

lgtm

@Tinob
Copy link
Contributor

Tinob commented Jun 1, 2015

@degasus: the different API matrix multiplications differences can be bypassed abstracting the operation. The improvements to the interface I'm working on solves the problem.

@LenaWil
Copy link
Contributor Author

LenaWil commented Jun 2, 2015

Why is it not merged yet?
@Tilka approved it more than 24 hours ago.
(I'm sorry I'm so impatient)

@Tilka
Copy link
Member

Tilka commented Jun 2, 2015

@TijmenW The thing is I don't actually know OpenGL. While we're waiting for someone to properly review this, you could rebase the two commits into one.

mat3 r = mat3(-0.016,-0.123,-0.017,
0.006, 0.062, 0.017,
-0.094,-0.185, 0.991);
SetOutput(float4(c0.rgb * l + c1.rgb * r, c0.a));

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

@LenaWil
Copy link
Contributor Author

LenaWil commented Jun 2, 2015

@Tilka Oh, ok.

To be honest, I copied the dubious shader in 262c3b1, and only edited the matrix constants and the source of the constants to avoid messing things up.

Tilka added a commit that referenced this pull request Jun 2, 2015
add shaders for anaglyph Amber-Blue and Green-Magenta
@Tilka Tilka merged commit 2b5945a into dolphin-emu:master Jun 2, 2015
@dolphin-emu-bot
Copy link
Contributor

FifoCI detected that this change impacts graphical rendering. Here are the behavior differences detected by the system:

automated-fifoci-reporter

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
7 participants