thirdpartymirrors/lsfg-vk
1
0
Fork 0
mirror of https://github.com/PancakeTAS/lsfg-vk.git synced 2026-04-27 12:51:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

bugfixes final

Browse source
This commit is contained in:
PancakeTAS 2025-07-01 07:12:45 +02:00
parent 0bdbc4b25c
commit b7ca80adb7
No known key found for this signature in database
2 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/core/sampler.cpp
View file

@ -13,6 +13,7 @@ Sampler::Sampler(const Device& device, VkSamplerAddressMode mode) {
.addressModeU = mode, .addressModeU = mode,
.addressModeV = mode, .addressModeV = mode,
.addressModeW = mode, .addressModeW = mode,
.compareOp = mode == VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE ? VK_COMPARE_OP_ALWAYS : VK_COMPARE_OP_NEVER,
.maxLod = 15.99609F .maxLod = 15.99609F
}; };
VkSampler samplerHandle{}; VkSampler samplerHandle{};

19
src/lsfg.cpp
View file

@ -2,6 +2,7 @@
#include "core/commandbuffer.hpp" #include "core/commandbuffer.hpp"
#include "core/fence.hpp" #include "core/fence.hpp"
#include "core/image.hpp" #include "core/image.hpp"
#include "utils.hpp"
#include <cassert> #include <cassert>
#include <format> #include <format>
@ -30,14 +31,14 @@ Generator::Generator(const Context& context) {
this->downsampleChain.getOutImages().at(i)); this->downsampleChain.getOutImages().at(i));
this->betaChain = Shaderchains::Beta(context.device, context.descPool, this->betaChain = Shaderchains::Beta(context.device, context.descPool,
this->alphaChains.at(0).getOutImages0(), this->alphaChains.at(0).getOutImages0(),
this->alphaChains.at(0).getOutImages2(), this->alphaChains.at(0).getOutImages1(),
this->alphaChains.at(0).getOutImages1()); this->alphaChains.at(0).getOutImages2());
for (size_t i = 0; i < 7; i++) { for (size_t i = 0; i < 7; i++) {
if (i < 4) { if (i < 4) {
this->gammaChains.at(i) = Shaderchains::Gamma(context.device, context.descPool, this->gammaChains.at(i) = Shaderchains::Gamma(context.device, context.descPool,
this->alphaChains.at(6 - i).getOutImages0(), this->alphaChains.at(6 - i).getOutImages0(),
this->alphaChains.at(6 - i).getOutImages2(),
this->alphaChains.at(6 - i).getOutImages1(), this->alphaChains.at(6 - i).getOutImages1(),
this->alphaChains.at(6 - i).getOutImages2(),
this->betaChain.getOutImages().at(std::min(5UL, 6 - i)), this->betaChain.getOutImages().at(std::min(5UL, 6 - i)),
i == 0 ? std::nullopt i == 0 ? std::nullopt
: std::optional{this->gammaChains.at(i - 1).getOutImage2()}, : std::optional{this->gammaChains.at(i - 1).getOutImage2()},
@ -48,8 +49,8 @@ Generator::Generator(const Context& context) {
} else { } else {
this->magicChains.at(i - 4) = Shaderchains::Magic(context.device, context.descPool, this->magicChains.at(i - 4) = Shaderchains::Magic(context.device, context.descPool,
this->alphaChains.at(6 - i).getOutImages0(), this->alphaChains.at(6 - i).getOutImages0(),
this->alphaChains.at(6 - i).getOutImages2(),
this->alphaChains.at(6 - i).getOutImages1(), this->alphaChains.at(6 - i).getOutImages1(),
this->alphaChains.at(6 - i).getOutImages2(),
i == 4 ? this->gammaChains.at(i - 1).getOutImage2() i == 4 ? this->gammaChains.at(i - 1).getOutImage2()
: this->extractChains.at(i - 5).getOutImage(), : this->extractChains.at(i - 5).getOutImage(),
i == 4 ? this->gammaChains.at(i - 1).getOutImage1() i == 4 ? this->gammaChains.at(i - 1).getOutImage1()
@ -92,10 +93,6 @@ Generator::Generator(const Context& context) {
} }
void Generator::present(const Context& context) { void Generator::present(const Context& context) {
// TEST: upload input images
// TODO: implement test, lol
// TEST END
Core::CommandBuffer cmdBuffer(context.device, context.cmdPool); Core::CommandBuffer cmdBuffer(context.device, context.cmdPool);
cmdBuffer.begin(); cmdBuffer.begin();
@ -117,12 +114,6 @@ void Generator::present(const Context& context) {
cmdBuffer.end(); cmdBuffer.end();
// TEST: temporary fence submit logic
Core::Fence fence(context.device);
cmdBuffer.submit(context.device.getComputeQueue(), fence);
assert(fence.wait(context.device));
// TEST END
fc++; fc++;
} }