Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

ftl
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

7a9728f4

Commit 7a9728f4 authored 5 years ago by Nicolas Pope

Downloads
- Plain Diff

Merge branch 'master' into feature/258/multi-group

parents e0533ceb 47ad1d3c

No related branches found

No related tags found

Loading

This commit is part of merge request !186. Comments created here will be created in the context of that merge request.

Changes 5

Show whitespace changes

Inline Side-by-side

Showing

applications/merger/src/main.cpp 3 additions, 1 deletion

applications/merger/src/main.cpp
components/common/cpp/src/configuration.cpp 2 additions, 1 deletion

components/common/cpp/src/configuration.cpp
components/renderers/cpp/include/ftl/cuda/normals.hpp 5 additions, 0 deletions

components/renderers/cpp/include/ftl/cuda/normals.hpp
components/renderers/cpp/src/normals.cu 44 additions, 0 deletions

components/renderers/cpp/src/normals.cu
components/renderers/cpp/src/tri_render.cpp 12 additions, 0 deletions

components/renderers/cpp/src/tri_render.cpp

with 66 additions and 2 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment