Skip to content

Commit 0f65fba

Browse files
devshgraphicsprogrammingdevshgraphicsprogramming
committed
Fix example 47 and test 43
1 parent ff2c721 commit 0f65fba

File tree

2 files changed

+29
-23
lines changed

2 files changed

+29
-23
lines changed

‎examples_tests/47.DerivMapTest/main.cpp

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -393,8 +393,8 @@ class DerivMapTestApp : public ApplicationBase
393393

394394
swapchain->acquireNextImage(MAX_TIMEOUT, imageAcquire[resourceIx].get(), nullptr, &acquiredNextFBO);
395395

396-
nbl::video::IGPUCommandBuffer::SRenderpassBeginInfo beginInfo;
397396
{
397+
nbl::video::IGPUCommandBuffer::SRenderpassBeginInfo beginInfo;
398398
VkRect2D area;
399399
area.offset = { 0,0 };
400400
area.extent = { NBL_WINDOW_WIDTH, NBL_WINDOW_HEIGHT };
@@ -408,9 +408,9 @@ class DerivMapTestApp : public ApplicationBase
408408
beginInfo.renderpass = renderpass;
409409
beginInfo.renderArea = area;
410410
beginInfo.clearValues = &clear;
411+
commandBuffer->beginRenderPass(&beginInfo, nbl::asset::ESC_INLINE);
411412
}
412413

413-
commandBuffer->beginRenderPass(&beginInfo, nbl::asset::ESC_INLINE);
414414
commandBuffer->bindGraphicsPipeline(gpuGraphicsPipeline.get());
415415
commandBuffer->bindDescriptorSets(asset::EPBP_GRAPHICS, gpuGraphicsPipeline->getRenderpassIndependentPipeline()->getLayout(), 3, 1, &gpuSamplerDescriptorSet3.get(), 0u);
416416
ext::FullScreenTriangle::recordDrawCalls(commandBuffer.get());
@@ -498,7 +498,7 @@ class DerivMapTestApp : public ApplicationBase
498498
const auto swapchainImageUsage = static_cast<asset::IImage::E_USAGE_FLAGS>(asset::IImage::EUF_COLOR_ATTACHMENT_BIT);
499499
const video::ISurface::SFormat surfaceFormat(asset::EF_R8G8B8A8_SRGB, asset::ECP_COUNT, asset::EOTF_UNKNOWN);
500500

501-
CommonAPI::InitWithDefaultExt(initOutput, video::EAT_OPENGL_ES, "MeshLoaders", NBL_WINDOW_WIDTH, NBL_WINDOW_HEIGHT, SC_IMG_COUNT, swapchainImageUsage, surfaceFormat, nbl::asset::EF_D32_SFLOAT);
501+
CommonAPI::InitWithDefaultExt(initOutput, video::EAT_OPENGL, "MeshLoaders", NBL_WINDOW_WIDTH, NBL_WINDOW_HEIGHT, SC_IMG_COUNT, swapchainImageUsage, surfaceFormat);
502502
window = std::move(initOutput.window);
503503
gl = std::move(initOutput.apiConnection);
504504
surface = std::move(initOutput.surface);
@@ -541,17 +541,19 @@ class DerivMapTestApp : public ApplicationBase
541541
{
542542
switch (typeOfImage)
543543
{
544-
case nbl::asset::IImageView<nbl::asset::ICPUImage>::ET_2D:
545-
return "../present2D.frag";
546-
case nbl::asset::IImageView<nbl::asset::ICPUImage>::ET_2D_ARRAY:
547-
return "../present2DArray.frag";
548-
case nbl::asset::IImageView<nbl::asset::ICPUImage>::ET_CUBE_MAP:
549-
return "../presentCubemap.frag";
550-
default:
551-
{
552-
assert(false);
553-
}
544+
case nbl::asset::IImageView<nbl::asset::ICPUImage>::ET_2D:
545+
return "../present2D.frag";
546+
case nbl::asset::IImageView<nbl::asset::ICPUImage>::ET_2D_ARRAY:
547+
return "../present2DArray.frag";
548+
case nbl::asset::IImageView<nbl::asset::ICPUImage>::ET_CUBE_MAP:
549+
return "../presentCubemap.frag";
550+
default:
551+
{
552+
assert(false);
553+
break;
554+
}
554555
}
556+
return "";
555557
};
556558

557559
auto fs_bundle = assetManager->getAsset(getPathToFragmentShader(), {});
@@ -631,18 +633,21 @@ class DerivMapTestApp : public ApplicationBase
631633
auto& captionData = captionTexturesData.emplace_back();
632634
captionData.name = filename.string();
633635
captionData.extension = extension.string();
634-
captionData.viewType = [&]()
636+
captionData.viewType = [&]() -> std::string
635637
{
636638
const auto& viewType = newCpuImageViewTexture->getCreationParameters().viewType;
637639

638640
if (viewType == nbl::asset::IImageView<nbl::video::IGPUImage>::ET_2D)
639-
return std::string("ET_2D");
641+
return "ET_2D";
640642
else if (viewType == nbl::asset::IImageView<nbl::video::IGPUImage>::ET_2D_ARRAY)
641-
return std::string("ET_2D_ARRAY");
643+
return "ET_2D_ARRAY";
642644
else if (viewType == nbl::asset::IImageView<nbl::video::IGPUImage>::ET_CUBE_MAP)
643-
return std::string("ET_CUBE_MAP");
645+
return "ET_CUBE_MAP";
644646
else
647+
{
645648
assert(false);
649+
return "";
650+
}
646651
}();
647652

648653
const std::string finalFileNameWithExtension = captionData.name + captionData.extension;
@@ -663,9 +668,10 @@ class DerivMapTestApp : public ApplicationBase
663668
}
664669
}
665670

666-
gpuImageViews = cpu2gpu.getGPUObjectsFromAssets(cpuImageViews.data(), cpuImageViews.data() + cpuImageViews.size(), cpu2gpuParams);
667-
if (!gpuImageViews || gpuImageViews->size() < cpuImageViews.size())
668-
assert(false);
671+
cpu2gpuParams.beginCommandBuffers();
672+
gpuImageViews = cpu2gpu.getGPUObjectsFromAssets(cpuImageViews.data(), cpuImageViews.data()+cpuImageViews.size(), cpu2gpuParams);
673+
cpu2gpuParams.waitForCreationToComplete(false);
674+
assert(gpuImageViews && gpuImageViews->size()==cpuImageViews.size());
669675
}
670676

671677
void workLoopBody() override

‎examples_tests/Readme.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,12 @@ N = No support
7474
| 40.GLITest | S | S | S | S | S | S | N | S | COMPILE_WITH_GLI_LOADER |
7575
| 41.VisibilityBuffer | S | S | S | S | S | S | N | N | |
7676
| 42.FragmentShaderPathTracer | B | B | Y | S | S | S | S | S | |
77-
| 43.SumAndCDFFilters | S | N | S | S | N | S | N | N | |
77+
| 43.SumAndCDFFilters | Y | Y | Y | S | N | S | N | N | |
7878
| 44.LevelCurveExtraction | S | N | S | S | N | S | N | N | |
7979
| 45.BRDFEvalTest | S | S | S | S | S | S | N | S | |
8080
| 46.SamplingValidation | S | S | S | S | S | S | N | S | |
81-
| 47.DerivMapTest | S | N | S | S | N | S | N | N | |
82-
| 48.ArithmeticUnitTest | Y | N | Y | S | N | S | N | S | |
81+
| 47.DerivMapTest | Y | Y | B | S | N | S | N | N | |
82+
| 48.ArithmeticUnitTest | Y | Y | Y | S | N | S | N | S | |
8383
| 49.ComputeFFT | S | N | S | S | N | S | N | N | |
8484
| 50.NewAPITest | W | W | W | W | W | W | W | W | |
8585
| 51.RadixSort | W | N | W | W | N | W | N | W | |

0 commit comments

Comments
 (0)