Skip to content

Commit 5b8de05

Browse files
sergcppsergcpp
committed
Some refactoring
1 parent 0870927 commit 5b8de05

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1004
-1025
lines changed

‎CMakeLists.txt‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ set(INTERNAL_SOURCE_FILES internal/AtmosphereRef.h
6666
internal/BVHSplit.cpp
6767
internal/CDFUtils.h
6868
internal/CDFUtils.cpp
69+
internal/CompareOp.inl
6970
internal/Constants.inl
7071
internal/Convolution.h
7172
internal/Core.h
@@ -76,11 +77,17 @@ set(INTERNAL_SOURCE_FILES internal/AtmosphereRef.h
7677
internal/CoreSIMD.h
7778
internal/DenoiseRef.h
7879
internal/DenoiseRef.cpp
80+
internal/Filter.inl
7981
internal/Fixed.h
82+
internal/Format.inl
8083
internal/FreelistAlloc.h
8184
internal/FreelistAlloc.cpp
8285
internal/HashMap32.h
8386
internal/HashSet32.h
87+
internal/ImageParams.h
88+
internal/ImageParams.cpp
89+
internal/ImageSplitter.h
90+
internal/ImageSplitter.cpp
8491
internal/PMJ.h
8592
internal/PMJ.cpp
8693
internal/RadCacheRef.h
@@ -102,28 +109,21 @@ set(INTERNAL_SOURCE_FILES internal/AtmosphereRef.h
102109
internal/SmallVector.h
103110
internal/SparseStorageCPU.h
104111
internal/SparseStorageGPU.h
105-
internal/TextureCompare.inl
106-
internal/TextureFilter.inl
107-
internal/TextureFormat.inl
108-
internal/TextureParams.h
109-
internal/TextureParams.cpp
110-
internal/TextureSplitter.h
111-
internal/TextureSplitter.cpp
112112
internal/TextureStorageCPU.h
113113
internal/TextureStorageCPU.cpp
114114
internal/TextureUtils.h
115115
internal/TextureUtils.cpp
116116
internal/TextureUtilsNEON.cpp
117117
internal/TextureUtilsSSE2.cpp
118-
internal/TextureWrap.inl
119118
internal/Time_.h
120119
internal/Time.cpp
121120
internal/TonemapRef.h
122121
internal/TonemapRef.cpp
123122
internal/Trig.h
124123
internal/UNetFilter.h
125124
internal/UNetFilter.cpp
126-
internal/VectorGPU.h)
125+
internal/VectorGPU.h
126+
internal/Wrap.inl)
127127

128128
if (ENABLE_REF_IMPL)
129129
set(INTERNAL_SOURCE_FILES ${INTERNAL_SOURCE_FILES}
@@ -239,6 +239,10 @@ set(VK_SOURCE_FILES internal/Vk/AccStructureVK.h
239239
internal/Vk/DrawCallVK.cpp
240240
internal/Vk/FenceVK.h
241241
internal/Vk/FenceVK.cpp
242+
internal/Vk/ImageVK.h
243+
internal/Vk/ImageVK.cpp
244+
internal/Vk/ImageAtlasVK.h
245+
internal/Vk/ImageAtlasVK.cpp
242246
internal/Vk/MemoryAllocatorVK.h
243247
internal/Vk/MemoryAllocatorVK.cpp
244248
internal/Vk/PipelineVK.h
@@ -256,10 +260,6 @@ set(VK_SOURCE_FILES internal/Vk/AccStructureVK.h
256260
internal/Vk/SparseStorageVK.h
257261
internal/Vk/SPIRV.h
258262
internal/Vk/SPIRV.cpp
259-
internal/Vk/TextureVK.h
260-
internal/Vk/TextureVK.cpp
261-
internal/Vk/TextureAtlasVK.h
262-
internal/Vk/TextureAtlasVK.cpp
263263
internal/Vk/VectorVK.h
264264
internal/Vk/VertexInputVK.h
265265
internal/Vk/VertexInputVK.cpp)
@@ -279,6 +279,10 @@ if(WIN32)
279279
internal/Dx/DrawCallDX.cpp
280280
internal/Dx/FenceDX.h
281281
internal/Dx/FenceDX.cpp
282+
internal/Dx/ImageDX.h
283+
internal/Dx/ImageDX.cpp
284+
internal/Dx/ImageAtlasDX.h
285+
internal/Dx/ImageAtlasDX.cpp
282286
internal/Dx/MemoryAllocatorDX.h
283287
internal/Dx/MemoryAllocatorDX.cpp
284288
internal/Dx/PipelineDX.h
@@ -294,10 +298,6 @@ if(WIN32)
294298
internal/Dx/ShaderDX.h
295299
internal/Dx/ShaderDX.cpp
296300
internal/Dx/SparseStorageDX.h
297-
internal/Dx/TextureDX.h
298-
internal/Dx/TextureDX.cpp
299-
internal/Dx/TextureAtlasDX.h
300-
internal/Dx/TextureAtlasDX.cpp
301301
internal/Dx/VectorDX.h
302302
internal/Dx/VertexInputDX.h
303303
internal/Dx/VertexInputDX.cpp)

internal/TextureCompare.inl renamed to internal/CompareOp.inl

File renamed without changes.

‎internal/Dx/DrawCallDX.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
#include "BufferDX.h"
1414
#include "ContextDX.h"
1515
#include "DescriptorPoolDX.h"
16+
#include "ImageAtlasDX.h"
17+
#include "ImageDX.h"
1618
#include "PipelineDX.h"
17-
#include "TextureAtlasDX.h"
18-
#include "TextureDX.h"
1919

2020
namespace Ray {
2121
namespace Dx {

‎internal/Dx/DrawCallDX.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ class BumpAlloc;
1717
template <class Allocator> class DescrMultiPoolAlloc;
1818
class Pipeline;
1919
class Program;
20-
class TextureAtlas;
21-
class Texture;
20+
class ImageAtlas;
21+
class Image;
2222
struct DescrTable;
2323
class Sampler;
2424

@@ -41,20 +41,20 @@ enum class eBindTarget : uint16_t {
4141

4242
struct OpaqueHandle {
4343
union {
44-
const Texture *tex;
44+
const Image *tex;
4545
const Buffer *buf;
46-
const TextureAtlas *tex_arr;
46+
const ImageAtlas *tex_arr;
4747
const AccStructure *acc_struct;
4848
const Sampler *sampler;
4949
const DescrTable *descr_table;
5050
};
5151
int count = 0;
5252
OpaqueHandle() = default;
53-
OpaqueHandle(const Texture &_tex) : tex(&_tex), count(1) {}
53+
OpaqueHandle(const Image &_tex) : tex(&_tex), count(1) {}
5454
OpaqueHandle(const Buffer &_buf) : buf(&_buf), count(1) {}
55-
OpaqueHandle(const TextureAtlas &_tex_arr) : tex_arr(&_tex_arr), count(1) {}
56-
OpaqueHandle(const TextureAtlas *_tex_arr, int _count = 1) : tex_arr(_tex_arr), count(_count) {}
57-
OpaqueHandle(Span<const TextureAtlas> tex_arrs) : tex_arr(tex_arrs.data()), count(int(tex_arrs.size())) {}
55+
OpaqueHandle(const ImageAtlas &_tex_arr) : tex_arr(&_tex_arr), count(1) {}
56+
OpaqueHandle(const ImageAtlas *_tex_arr, int _count = 1) : tex_arr(_tex_arr), count(_count) {}
57+
OpaqueHandle(Span<const ImageAtlas> tex_arrs) : tex_arr(tex_arrs.data()), count(int(tex_arrs.size())) {}
5858
OpaqueHandle(const Sampler &_sampler) : sampler(&_sampler), count(1) {}
5959
OpaqueHandle(const AccStructure &_acc_struct) : acc_struct(&_acc_struct), count(1) {}
6060
OpaqueHandle(const DescrTable &_descr_table) : descr_table(&_descr_table), count(1) {}

0 commit comments

Comments
 (0)