Skip to content

Commit da0fcf3

Browse files
author
devsh
committed
remove virtual texturing code (will come back as GPU-only streaming based)
1 parent 74a01ff commit da0fcf3

File tree

4 files changed

+11
-2196
lines changed

4 files changed

+11
-2196
lines changed

include/nbl/asset/material_compiler/CMaterialCompilerGLSLBackendCommon.h

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
#include <ostream>
1212

13-
#include <nbl/asset/utils/ICPUVirtualTexture.h>
1413
#include <nbl/asset/material_compiler/IR.h>
1514

1615

@@ -271,7 +270,7 @@ class CMaterialCompilerGLSLBackendCommon
271270
#undef SWITCH_REG_CNT_FOR_PARAM_NUM
272271
}
273272

274-
using VTID = asset::ICPUVirtualTexture::SMasterTextureData;
273+
using VTID = uint64_t;// asset::ICPUVirtualTexture::SMasterTextureData;
275274
#include "nbl/nblpack.h"
276275
struct STextureData {
277276

@@ -281,7 +280,7 @@ class CMaterialCompilerGLSLBackendCommon
281280
uint32_t scale;//float
282281

283282
};
284-
STextureData() : vtid(VTID::invalid()), scale(0u){}
283+
STextureData() : vtid(/*VTID::invalid()*/0xdeadbeefBADC0FFEull), scale(0u) {}
285284
bool operator==(const STextureData& rhs) const { return memcmp(this,&rhs,sizeof(rhs))==0; }
286285
struct hash
287286
{
@@ -610,7 +609,7 @@ class CMaterialCompilerGLSLBackendCommon
610609
public:
611610
struct VT
612611
{
613-
using addr_t = asset::ICPUVirtualTexture::SMasterTextureData;
612+
using addr_t = uint64_t;//asset::ICPUVirtualTexture::SMasterTextureData;
614613
struct alloc_t
615614
{
616615
asset::E_FORMAT format;
@@ -631,23 +630,27 @@ class CMaterialCompilerGLSLBackendCommon
631630

632631
addr_t alloc(const alloc_t a, core::smart_refctd_ptr<asset::ICPUImage>&& texture, asset::ICPUSampler::E_TEXTURE_BORDER_COLOR border)
633632
{
633+
/*
634634
addr_t addr = vt->alloc(a.format, a.extent, a.subresource, a.uwrap, a.vwrap);
635635
636636
commit_t cm{ addr, std::move(texture), a.subresource, a.uwrap, a.vwrap, border };
637637
pendingCommits.push_back(std::move(cm));
638638
639639
return addr;
640+
*/
641+
return 0xdeadbeefBADC0FFEull;
640642
}
641643

642644
bool commit(const commit_t& cm)
643645
{
644-
auto texture = vt->createPoTPaddedSquareImageWithMipLevels(cm.image.get(), cm.uwrap, cm.vwrap, cm.border).first;
645-
return vt->commit(cm.addr, texture.get(), cm.subresource, cm.uwrap, cm.vwrap, cm.border);
646+
// auto texture = vt->createPoTPaddedSquareImageWithMipLevels(cm.image.get(), cm.uwrap, cm.vwrap, cm.border).first;
647+
// return vt->commit(cm.addr, texture.get(), cm.subresource, cm.uwrap, cm.vwrap, cm.border);
648+
return false;
646649
}
647650
//! @returns if all commits succeeded
648651
bool commitAll()
649652
{
650-
vt->shrink();
653+
// vt->shrink();
651654

652655
bool success = true;
653656
for (commit_t& cm : pendingCommits)
@@ -657,7 +660,7 @@ class CMaterialCompilerGLSLBackendCommon
657660
}
658661

659662
core::vector<commit_t> pendingCommits;
660-
core::smart_refctd_ptr<asset::ICPUVirtualTexture> vt;
663+
// core::smart_refctd_ptr<asset::ICPUVirtualTexture> vt;
661664
} vt;
662665
};
663666

0 commit comments

Comments
 (0)