Skip to content
Snippets Groups Projects
Commit f2a9ab45 authored by Nicolas Pope's avatar Nicolas Pope
Browse files

Merge branch 'bug/242/aaright' into 'master'

Resolves #242 no aa on right channel

Closes #242

See merge request nicolas.pope/ftl!169
parents 3ec52ef6 b732ff70
No related branches found
No related tags found
1 merge request!169Resolves #242 no aa on right channel
Pipeline #16424 passed
...@@ -18,5 +18,12 @@ bool FXAA::apply(ftl::rgbd::Frame &in, ftl::rgbd::Frame &out, ftl::rgbd::Source ...@@ -18,5 +18,12 @@ bool FXAA::apply(ftl::rgbd::Frame &in, ftl::rgbd::Frame &out, ftl::rgbd::Source
stream stream
); );
if (in.hasChannel(Channel::Right)) {
ftl::cuda::fxaa(
in.getTexture<uchar4>(Channel::Right),
stream
);
}
return true; return true;
} }
...@@ -71,6 +71,7 @@ __global__ void filter_fxaa2(ftl::cuda::TextureObject<uchar4> data) { ...@@ -71,6 +71,7 @@ __global__ void filter_fxaa2(ftl::cuda::TextureObject<uchar4> data) {
//surf2Dwrite<uchar4>(out_color, surfaceWrite, x*sizeof(uchar4), y); //surf2Dwrite<uchar4>(out_color, surfaceWrite, x*sizeof(uchar4), y);
// FIXME: Should not output to same texture object.
data(x,y) = out_color; data(x,y) = out_color;
} }
......
...@@ -628,6 +628,7 @@ bool Triangular::render(ftl::rgbd::VirtualSource *src, ftl::rgbd::Frame &out) { ...@@ -628,6 +628,7 @@ bool Triangular::render(ftl::rgbd::VirtualSource *src, ftl::rgbd::Frame &out) {
out.create<GpuMat>(Channel::Right, Format<uchar4>(camera.width, camera.height)); out.create<GpuMat>(Channel::Right, Format<uchar4>(camera.width, camera.height));
out.get<GpuMat>(Channel::Right).setTo(background_, cvstream); out.get<GpuMat>(Channel::Right).setTo(background_, cvstream);
out.createTexture<uchar4>(Channel::Right, true);
// Need to re-dibr due to pose change // Need to re-dibr due to pose change
if (mesh_) { if (mesh_) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment