Fix Validation Errors and Bumpmaps #499
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… image that needs its mips computed Also stop computing mips for images that have some regions specified already in non-base mip levels
…changed a few flags into `core::bitfield`
…xtended usages of the source image, @achalpandeyy I'm ready for your compute blits! P.S. Also fixed the setting of IGPUImageView's format to always match IGPUImages, now only if format got promoted.
Comment on lines
+1567
to
+1568
| const bool formatGotPromoted = asset::getFormatClass(cpuParams.format)!=asset::getFormatClass(gpuImgParams.format); | ||
| params.format = formatGotPromoted ? gpuImgParams.format:cpuParams.format; |
There was a problem hiding this comment.
@Erfan-Ahmadi corrected the thing that would wipe away all views' formats when using Asset Converter
Comment on lines
+1569
to
+1596
| params.subUsages = cpuParams.subUsages; | ||
| // TODO: In Asset Converter 2.0 we'd pass through all descriptor sets etc and propagate the adding usages backwards to views, but here we need to trim the image's usages instead | ||
| { | ||
| IPhysicalDevice::SFormatImageUsages::SUsage validUsages(gpuImgParams.usage); | ||
| if (params.image->getTiling()!=IGPUImage::ET_LINEAR) | ||
| validUsages = validUsages & optimalUsages[params.format]; | ||
| else | ||
| validUsages = validUsages & linearUsages[params.format]; | ||
| // add them after trimming | ||
| if (validUsages.sampledImage) | ||
| params.subUsages |= IGPUImage::EUF_SAMPLED_BIT; | ||
| if (validUsages.storageImage) | ||
| params.subUsages |= IGPUImage::EUF_STORAGE_BIT; | ||
| if (validUsages.attachment) | ||
| { | ||
| if (asset::isDepthOrStencilFormat(params.format)) | ||
| params.subUsages |= IGPUImage::EUF_DEPTH_STENCIL_ATTACHMENT_BIT; | ||
| else | ||
| params.subUsages |= IGPUImage::EUF_COLOR_ATTACHMENT_BIT; | ||
| } | ||
| if (validUsages.transferSrc) | ||
| params.subUsages |= IGPUImage::EUF_TRANSFER_SRC_BIT; | ||
| if (validUsages.transferDst) | ||
| params.subUsages |= IGPUImage::EUF_TRANSFER_DST_BIT; | ||
| // stuff thats not dependent on device caps | ||
| const auto uncappedUsages = IGPUImage::EUF_TRANSIENT_ATTACHMENT_BIT|IGPUImage::EUF_INPUT_ATTACHMENT_BIT|IGPUImage::EUF_SHADING_RATE_IMAGE_BIT_NV|IGPUImage::EUF_FRAGMENT_DENSITY_MAP_BIT_EXT; | ||
| params.subUsages |= gpuImgParams.usage&uncappedUsages; | ||
| } |
There was a problem hiding this comment.
@Hazardu for future reference
…ut on the verbosity
normalmaps are usually encoded in [0,255] UNORM then decoded via 2x-1 therefore there's no way to express a 0.0, meaning 127 got interpreted as (0.003,-0.003,1.0), added an epsilon to produce 0 len normals.
|
|
||
| // TODO: make sure there is no leak due to MaxChannels! | ||
| base_t::template onDecode(inFormat, state, srcPix, sample, swizzledSample, inBlockCoord.x, inBlockCoord.y); | ||
| base_t::template onDecode(inFormat, state, srcPix, preSwizzleSample, sample, inBlockCoord.x, inBlockCoord.y); |
There was a problem hiding this comment.
@achalpandeyy before the swizzledSample wouldn't get used at all which would mess with Derivative Map from Heightmap generation
Merged
10 tasks
…d some nice defaults to the creation parameters
devshgraphicsprogramming
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Fixes:
dittbranchTesting
Just running examples, nothing complex like comparing device props and limit structs before and after implementing changes.
TODO list:
Actually fix #472