Skip to content

Commit 74a01ff

Browse files
author
devsh
committed
remove virtual texturing GLSL
1 parent dd6af8c commit 74a01ff

File tree

8 files changed

+4
-427
lines changed

8 files changed

+4
-427
lines changed

include/nbl/asset/asset.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,5 @@
7777
//VT
7878
// #include "nbl/asset/utils/CCPUMeshPackerV1.h"
7979
// #include "nbl/asset/utils/CCPUMeshPackerV2.h"
80-
#include "nbl/asset/utils/ICPUVirtualTexture.h"
8180

8281
#endif

include/nbl/builtin/glsl/virtual_texturing/descriptors.glsl

Lines changed: 0 additions & 40 deletions
This file was deleted.

include/nbl/builtin/glsl/virtual_texturing/extensions.glsl

Lines changed: 0 additions & 14 deletions
This file was deleted.

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

Lines changed: 0 additions & 278 deletions
This file was deleted.

src/nbl/asset/material_compiler/CMaterialCompilerGLSLBackendCommon.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ class ITraversalGenerator
252252

253253
assert(bm->type == IR::CGeomModifierNode::ET_DERIVATIVE);
254254

255-
_dst.bumpmap.derivmap.vtid = bm ? packTexture(bm->texture) : instr_stream::VTID::invalid();
255+
// _dst.bumpmap.derivmap.vtid = bm ? packTexture(bm->texture) : instr_stream::VTID::invalid();
256256
core::uintBitsToFloat(_dst.bumpmap.derivmap.scale) = bm ? bm->texture.scale : 0.f;
257257
}
258258
break;
@@ -290,7 +290,7 @@ class ITraversalGenerator
290290
return found->second;
291291

292292
auto img = tex.image->getCreationParameters().image;
293-
img = m_ctx->vt.vt->createUpscaledImage(img.get());
293+
// img = m_ctx->vt.vt->createUpscaledImage(img.get());
294294
auto* sampler = tex.sampler.get();
295295

296296
const auto& extent = img->getCreationParameters().extent;
@@ -1492,8 +1492,8 @@ void material_compiler::CMaterialCompilerGLSLBackendCommon::debugPrint(std::ostr
14921492
_out << "reg = " << reg << "\n";
14931493
_out << "reg_count = " << reg_cnt << "\n";
14941494
_out << "scale = " << core::uintBitsToFloat(scale) << "\n";
1495-
_out << "pgtab coords = [ " << vtid.pgTab_x << ", " << vtid.pgTab_y << ", " << vtid.pgTab_layer << " ]\n";
1496-
_out << "orig extent = { " << vtid.origsize_x << ", " << vtid.origsize_y << " }\n";
1495+
// _out << "pgtab coords = [ " << vtid.pgTab_x << ", " << vtid.pgTab_y << ", " << vtid.pgTab_layer << " ]\n";
1496+
// _out << "orig extent = { " << vtid.origsize_x << ", " << vtid.origsize_y << " }\n";
14971497
}
14981498
_out << "####### normal_precomp stream\n";
14991499
auto norm_precomp = _streams.get_norm_precomp();

src/nbl/asset/pch_asset.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@
3232
#include "nbl/asset/utils/CSPIRVIntrospector.h"
3333
#include "nbl/asset/utils/IShaderCompiler.h"
3434

35-
// builtins/headers
36-
#include "nbl/asset/utils/CGLSLVirtualTexturingBuiltinIncludeGenerator.h"
37-
3835

3936
// mesh
4037
#include "nbl/asset/utils/CGeometryCreator.h"

0 commit comments

Comments
 (0)