Skip to content

Commit 250ecd2

Browse files
author
devsh
committed
remove dead code we won't use
1 parent f59f54c commit 250ecd2

File tree

5 files changed

+10
-56
lines changed

5 files changed

+10
-56
lines changed

include/nbl/asset/material_compiler/CMaterialCompilerGLSLBackendCommon.h

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,10 @@
66
#define __NBL_ASSET_C_MITSUBA_MATERIAL_COMPILER_GLSL_BACKEND_COMMON_H_INCLUDED__
77

88

9-
#include <nbl/core/core.h>
109

1110
#include <cstdio>
1211
#include <ostream>
1312

14-
#include <nbl/asset/utils/ICPUVirtualTexture.h>
1513
#include <nbl/asset/material_compiler/IR.h>
1614

1715

@@ -293,13 +291,13 @@ class CMaterialCompilerGLSLBackendCommon
293291
}
294292

295293

296-
using VTID = asset::ICPUVirtualTexture::SMasterTextureData;
294+
using VTID = uint64_t;// asset::ICPUVirtualTexture::SMasterTextureData;
297295

298296
#include "nbl/nblpack.h"
299297
struct STextureData {
300298
STextureData() = default;
301299

302-
VTID vtid = VTID::invalid();
300+
VTID vtid = 0xdeadbeefull;// VTID::invalid();
303301
union {
304302
uint32_t prefetch_reg;//uint32
305303
uint32_t scale = 0u;//float
@@ -404,13 +402,14 @@ class CMaterialCompilerGLSLBackendCommon
404402
#include "nbl/nblpack.h"
405403
struct STextureOrConstant
406404
{
407-
inline void setConst(core::vector3df_SIMD c) { constant = core::rgb32f_to_rgb19e7(c.pointer); }
405+
inline void setConst(core::vector3df_SIMD c) {}// { constant = core::rgb32f_to_rgb19e7(c.pointer); }
408406
inline void setPrefetchReg(uint32_t r) { prefetch = r; }
409407

410408
inline core::vector3df_SIMD getConst() const
411409
{
412-
auto c = core::rgb19e7_to_rgb32f(constant);
413-
return core::vector3df_SIMD(c.x, c.y, c.z);
410+
return {};
411+
// auto c = core::rgb19e7_to_rgb32f(constant);
412+
// return core::vector3df_SIMD(c.x, c.y, c.z);
414413
}
415414

416415
union
@@ -647,6 +646,7 @@ class CMaterialCompilerGLSLBackendCommon
647646
core::unordered_map<VTallocKey, instr_stream::VTID, VTallocKeyHash> VTallocMap;
648647

649648
public:
649+
#if 0
650650
class VT
651651
{
652652
public:
@@ -738,6 +738,7 @@ class CMaterialCompilerGLSLBackendCommon
738738
core::vector<commit_t> pendingCommits;
739739
} vt;
740740
};
741+
#endif
741742

742743
struct result_t
743744
{

include/nbl/asset/material_compiler/CMaterialCompilerGLSLRasterBackend.h

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

include/nbl/asset/material_compiler/IR.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,12 @@ class IR : public core::IReferenceCounted
9999
*this = c;
100100
}
101101
inline SParameter(type_of_const&& c) : SParameter(c) {}
102+
#if 0
102103
inline SParameter(const STextureSource& c) : SParameter()
103104
{
104105
*this = t;
105106
}
107+
#endif
106108
inline SParameter(STextureSource&& t) : SParameter()
107109
{
108110
*this = std::move(t);

src/nbl/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -222,10 +222,6 @@ set(NBL_ASSET_SOURCES
222222
asset/interchange/CImageWriterTGA.cpp
223223
asset/interchange/CImageWriterOpenEXR.cpp # TODO: Nahim
224224
asset/interchange/CGLIWriter.cpp
225-
226-
# Material compiler
227-
asset/material_compiler/CMaterialCompilerGLSLBackendCommon.cpp
228-
asset/material_compiler/CMaterialCompilerGLSLRasterBackend.cpp
229225
)
230226
set(NBL_VIDEO_SOURCES
231227
# Utilities

src/nbl/asset/material_compiler/CMaterialCompilerGLSLRasterBackend.cpp

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

0 commit comments

Comments
 (0)