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

Split DirectX stuff into a subdirectory of plPipeline #345

Merged
merged 6 commits into from
Jul 25, 2013

Conversation

dpogue
Copy link
Member

@dpogue dpogue commented Jul 21, 2013

Firstly, this allows us to compile on Linux (although linking will fail, but that's expected for most things at this point).

Secondly, it makes it easier for us to eventually add OpenGL as a second pipeline alongside without significant restructuring.

/ping @Mystfit because this probably affects some of his post-processing stuff

@@ -203,6 +203,8 @@ uint32_t *plTextGenerator::IAllocateOSSurface( uint16_t width, uint16_t hei
SelectObject( fWinAlphaDC, fWinAlphaBitmap );

return (uint32_t *)fWinRGBBits;
#else
return 0;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nullptr?

@dpogue
Copy link
Member Author

dpogue commented Jul 23, 2013

@Hoikas updated

@Mystler
Copy link
Contributor

Mystler commented Jul 23, 2013

Looks good and seemed to work fine when testing. 👍

@Deledrius
Copy link
Member

👍

@Hoikas
Copy link
Member

Hoikas commented Jul 23, 2013

Still waiting on @Mystfit, I guess...

@Mystfit
Copy link

Mystfit commented Jul 24, 2013

I think it looks great. My post processing stuff is mainly in the DX side
only right now but it's a good opportunity to abstract it out to use this
file layout instead.

-- Byron Mallett
On 24/07/2013 5:29 AM, "Adam Johnson" notifications@github.com wrote:

Still waiting on @Mystfit https://github.com/Mystfit, I guess...


Reply to this email directly or view it on GitHubhttps://github.com//pull/345#issuecomment-21431145
.

@Hoikas
Copy link
Member

Hoikas commented Jul 24, 2013

The plDXPipeline headers and sources aren't explicitly added to the source groups. This works (sometimes), but it would be nice to have them in their own source groups instead of relying on cmake figuring out that they got omitted. Aside from that, it compiles and works well.

@dpogue
Copy link
Member Author

dpogue commented Jul 25, 2013

This should be good to go. Can someone please run cmake on Windows and check that the resulting VS projects have the DX subfolder? I'm not very convinced about the directionality of those slashes...

Hoikas added a commit that referenced this pull request Jul 25, 2013
Split DirectX stuff into a subdirectory of plPipeline
@Hoikas Hoikas merged commit c536cee into H-uru:master Jul 25, 2013
@Deledrius
Copy link
Member

Works fine here, @dpogue. 👍

@Mystfit
Copy link

Mystfit commented Jul 25, 2013

Yep, works fine here too.

@dpogue dpogue deleted the pipeline branch December 27, 2013 03:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants