try and fix some longstanding VT issues (but still need @Crisspl to look at the samplers for uint/int descriptors of VT)

Author: devshgraphicsprogramming

include/nbl/asset/utils/IVirtualTexture.h

@@ -245,7 +245,7 @@ class IVirtualTexture : public core::IReferenceCounted, public IVirtualTextureBa
 
         return params;
     }
-    ISampler::SParams getPhysicalPageSamplerParams() const
+    ISampler::SParams getPhysicalStorageFloatSamplerParams() const
     {
         ISampler::SParams params;
         params.AnisotropicFilter = m_tilePadding ? core::findMSB(m_tilePadding<<1) : 0u;
@@ -262,21 +262,44 @@ class IVirtualTexture : public core::IReferenceCounted, public IVirtualTextureBa
 
         return params;
     }
+    ISampler::SParams getPhysicalStorageNonFloatSamplerParams() const
+    {
+        ISampler::SParams params;
+        params.AnisotropicFilter = 0u; // TODO: don't apply padding to uint and int textures (is it even possible with all the view aliasing going on?)
+        params.BorderColor = ISampler::ETBC_FLOAT_OPAQUE_WHITE;
+        params.CompareEnable = false;
+        params.CompareFunc = ISampler::ECO_NEVER;
+        params.LodBias = 0.f;
+        params.MaxLod = 0.f;
+        params.MinLod = 0.f;
+        params.MaxFilter = ISampler::ETF_NEAREST;
+        params.MinFilter = ISampler::ETF_NEAREST;
+        params.MipmapMode = ISampler::ESMM_NEAREST;
+        params.TextureWrapU = params.TextureWrapV = params.TextureWrapW = ISampler::ETC_CLAMP_TO_EDGE;
+
+        return params;
+    }
 
     virtual core::smart_refctd_ptr<sampler_t> createSampler(const ISampler::SParams& _params) const = 0;
 
-    core::smart_refctd_ptr<sampler_t> getPhysicalPageSampler() const
-    {
-        if (!m_physicalPageSampler)
-            m_physicalPageSampler = createSampler(getPhysicalPageSamplerParams());
-        return m_physicalPageSampler;
-    }
     core::smart_refctd_ptr<sampler_t> getPageTableSampler() const
     {
         if (!m_pageTableSampler)
             m_pageTableSampler = createSampler(getPageTableSamplerParams());
         return m_pageTableSampler;
     }
+    core::smart_refctd_ptr<sampler_t> getPhysicalStorageFloatSampler() const
+    {
+        if (!m_physicalStorageFloatSampler)
+            m_physicalStorageFloatSampler = createSampler(getPhysicalStorageFloatSamplerParams());
+        return m_physicalStorageFloatSampler;
+    }
+    core::smart_refctd_ptr<sampler_t> getPhysicalStorageNonFloatSampler() const
+    {
+        if (!m_physicalStorageNonFloatSampler)
+            m_physicalStorageNonFloatSampler = createSampler(getPhysicalStorageNonFloatSamplerParams());
+        return m_physicalStorageNonFloatSampler;
+    }
 
     uint32_t getMaxAllocationPageCount() const
     {
@@ -384,7 +407,8 @@ class IVirtualTexture : public core::IReferenceCounted, public IVirtualTextureBa
     core::smart_refctd_ptr<image_t> m_pageTable;
     mutable core::smart_refctd_ptr<image_view_t> m_pageTableView;
     mutable core::smart_refctd_ptr<sampler_t> m_pageTableSampler;
-    mutable core::smart_refctd_ptr<sampler_t> m_physicalPageSampler;
+    mutable core::smart_refctd_ptr<sampler_t> m_physicalStorageFloatSampler;
+    mutable core::smart_refctd_ptr<sampler_t> m_physicalStorageNonFloatSampler;
 
     using pg_tab_addr_alctr_t = core::GeneralpurposeAddressAllocator<uint32_t>;
     std::array<pg_tab_addr_alctr_t, MAX_PAGE_TABLE_LAYERS> m_pageTableLayerAllocators;
@@ -1012,7 +1036,8 @@ class IVirtualTexture : public core::IReferenceCounted, public IVirtualTextureBa
         auto* samplers = _outSamplers;
 
         samplers[0] = getPageTableSampler();
-        std::fill(samplers+1, samplers+samplerCount, getPhysicalPageSampler());
+        std::fill(samplers+1, samplers+samplerCount, getPhysicalStorageFloatSampler());
+        //std::fill(samplers+1, samplers+samplerCount, getPhysicalStorageNonFloatSampler()); // TODO: @Crisspl fix issue #106 please
 
         auto fillBinding = [](auto& bnd, uint32_t _binding, uint32_t _count, core::smart_refctd_ptr<sampler_t>* _samplers) {
             bnd.binding = _binding;
@@ -1022,7 +1047,7 @@ class IVirtualTexture : public core::IReferenceCounted, public IVirtualTextureBa
             bnd.samplers = _samplers;
         };
 
-        fillBinding(bindings[0], _pgtBinding, 1u, samplers); // @Crisspl why is the count hardcoded to 1 !?
+        fillBinding(bindings[0], _pgtBinding, 1u, samplers);
 
         uint32_t i = 1u;
         if (getFloatViews().size())
@@ -1032,12 +1057,12 @@ class IVirtualTexture : public core::IReferenceCounted, public IVirtualTextureBa
         }
         if (getIntViews().size())
         {
-            fillBinding(bindings[i], _isamplersBinding, getIntViews().size(), samplers+1); // @Crisspl this has to be wrong! Sampler state for an interpolated float texture is definitely wrong to use for a integer texture
+            fillBinding(bindings[i], _isamplersBinding, getIntViews().size(), samplers+1); // TODO: @Crisspl this has to be wrong! Sampler state for an interpolated float texture is definitely wrong to use for a integer texture
             ++i;
         }
         if (getUintViews().size())
         {
-            fillBinding(bindings[i], _usamplersBinding, getUintViews().size(), samplers+1); // @Crisspl this has to be wrong! Sampler state for an interpolated float texture is definitely wrong to use for a integer texture
+            fillBinding(bindings[i], _usamplersBinding, getUintViews().size(), samplers+1); // TODO: @Crisspl this has to be wrong! Sampler state for an interpolated float texture is definitely wrong to use for a integer texture
         }
 
         return std::make_pair(bindingCount, samplerCount);

include/nbl/builtin/glsl/virtual_texturing/impl_functions.glsl

@@ -155,8 +155,8 @@ vec4 nbl_glsl_vTextureGrad_impl(in uint formatID, in vec3 virtualUV, in mat2 dOr
     // maybe unroll a few times manually
     while (outstandingSampleMask!=uvec2(0u))
     {
-		uvec2 tmp = outstandingSampleMask;
-        uint subgroupFormatID = subgroupBroadcast(formatID,tmp[1]!=0u ? 32u:findLSB(tmp[0]));
+        const bool bottomNotEmpty = outstandingSampleMask[0]!=0u;
+        uint subgroupFormatID = subgroupBroadcast(formatID,findLSB(bottomNotEmpty ? outstandingSampleMask[0]:outstandingSampleMask[1])+(bottomNotEmpty ? 0:32));
         bool canSample = subgroupFormatID==formatID; // do I need this? && (outstandingSampleMask&gl_SubGroupEqMaskARB)==gl_SubGroupEqMaskARB;
         outstandingSampleMask ^= subgroupBallot(canSample).xy;
         if (canSample)
@@ -196,11 +196,10 @@ vec4 nbl_glsl_vTextureGrad(in uvec2 _texData, in vec2 uv, in mat2 dUV)
 #if _NBL_VT_INT_VIEWS_COUNT
 ivec4 nbl_glsl_iVTextureLod_impl(in uint formatID, in vec3 virtualUV, in uint lod, in uint originalMaxFullMip)
 {
-    int nonnegativeLod = int(lod);
-    int clippedLoD = min(nonnegativeLod,originalMaxFullMip);
-    int levelInTail = nonnegativeLod - clippedLoD;
+    const int clippedLoD = originalMaxFullMip!=0u ? min(lod,originalMaxFullMip):0u;
+    const int levelInTail = lod-clippedLoD;
 
-    vec3 physCoord = nbl_glsl_vTexture_helper(formatID, virtualUV, clippedLoD, levelInTail);
+    const vec3 physCoord = nbl_glsl_vTexture_helper(formatID,virtualUV,clippedLoD,levelInTail);
 #ifdef NBL_GL_EXT_nonuniform_qualifier
 	return textureLod(iphysicalTileStorageFormatView[nonuniformEXT(formatID)], physCoord, lod);
 #else
@@ -238,11 +237,10 @@ ivec4 nbl_glsl_iVTextureLod(in uvec2 _texData, in vec2 uv, in uint lod)
 #if _NBL_VT_UINT_VIEWS_COUNT
 uvec4 nbl_glsl_uVTextureLod_impl(in uint formatID, in vec3 virtualUV, in uint lod, in uint originalMaxFullMip)
 {
-    int nonnegativeLod = int(lod);
-    int clippedLoD = min(nonnegativeLod,originalMaxFullMip);
-    int levelInTail = nonnegativeLod - clippedLoD;
+    const int clippedLoD = originalMaxFullMip!=0u ? min(lod,originalMaxFullMip):0u;
+    const int levelInTail = lod-clippedLoD;
 
-    vec3 physCoord = nbl_glsl_vTexture_helper(formatID, virtualUV, clippedLoD, levelInTail);
+    const vec3 physCoord = nbl_glsl_vTexture_helper(formatID,virtualUV,clippedLoD,levelInTail);
 #ifdef NBL_GL_EXT_nonuniform_qualifier
 	return textureLod(uphysicalTileStorageFormatView[nonuniformEXT(formatID)], physCoord, lod);
 #else
@@ -277,54 +275,4 @@ uvec4 nbl_glsl_uVTextureLod(in uvec2 _texData, in vec2 uv, in uint lod)
 }
 #endif //_NBL_VT_UINT_VIEWS_COUNT
 
-/*
-#ifdef NBL_GL_EXT_nonuniform_qualifier
-	#define _NBL_DIVERGENT_SAMPLING_IMPL(retval_t, physicalSamplerName) return textureLod(physicalSamplerName[nonuniformEXT(formatID)], physCoord, lod)
-#else
-	#define _NBL_DIVERGENT_SAMPLING_IMPL(retval_t, physicalSamplerName) \
-    retval_t retval; \
-    uint64_t outstandingSampleMask = ballotARB(true); \
-    while (outstandingSampleMask != uint64_t(0u)) \ 
-    { \
-        uvec2 tmp = unpackUint2x32(outstandingSampleMask); \
-        uint subgroupFormatID = readInvocationARB(formatID, tmp[1] != 0u ? 32u : findLSB(tmp[0])); \
-        bool canSample = subgroupFormatID == formatID; \
-        outstandingSampleMask ^= ballotARB(canSample); \
-        if (canSample) \
-            retval = textureLod(physicalSamplerName[subgroupFormatID], physCoord, lod); \
-    } \
-    return retval
-#endif
-
-//problem is with this line below "unexpected LEFT_BRACE", no idea why
-#define _NBL_DEFINE_VT_INTEGER_FUNCTIONS(funcName, implFuncName, retval_t, physicalSamplerName) retval_t implFuncName##(in uint formatID, in vec3 virtualUV, in uint lod, in int originalMaxFullMip) \
-{ \
-    int nonnegativeLod = int(lod); \
-    int clippedLoD = min(nonnegativeLod,originalMaxFullMip); \
-    int levelInTail = nonnegativeLod - clippedLoD; \
-    \
-    vec3 physCoord = nbl_glsl_vTexture_helper(formatID, virtualUV, clippedLoD, levelInTail); \
-	_NBL_DIVERGENT_SAMPLING_IMPL(retval_t, physicalSamplerName); \
-} \
-retval_t funcName(in uvec2 _texData, in vec2 uv, in uint lod) \
-{ \
-    vec2 originalSz = nbl_glsl_unpackSize(_texData); \
-	\
-    uvec2 wrap = nbl_glsl_unpackWrapModes(_texData); \
-    uv.x = nbl_glsl_wrapTexCoord(uv.x, wrap.x); \
-    uv.y = nbl_glsl_wrapTexCoord(uv.y, wrap.y); \
-    \
-    vec3 virtualUV = nbl_glsl_unpackVirtualUV(_texData); \
-    uint formatID = nbl_glsl_VT_layer2pid(uint(virtualUV.z)); \
-    virtualUV.xy += uv * originalSz; \
-    virtualUV.xy *= nbl_glsl_VT_getVTexSzRcp(); \
-	\
-    return nbl_glsl_vTextureLod_impl(formatID, virtualUV, lod, nbl_glsl_unpackMaxMipInVT(_texData)); \
-}
-
-_NBL_DEFINE_VT_INTEGER_FUNCTIONS(nbl_glsl_iVTextureLod, nbl_glsl_iVTextureLod_impl, ivec4, iphysicalTileStorageFormatView)
-_NBL_DEFINE_VT_INTEGER_FUNCTIONS(nbl_glsl_uVTextureLod, nbl_glsl_uVTextureLod_impl, uvec4, uphysicalTileStorageFormatView)
-#undef _NBL_DIVERGENT_SAMPLING_IMPL
-*/
-
 #endif //!_NBL_BUILTIN_GLSL_VIRTUAL_TEXTURING_IMPL_FUNCTIONS_INCLUDED_