Skip to content

Commit 53d3b18

Browse files
remove dead shader code
1 parent 207daec commit 53d3b18

File tree

2 files changed

+1
-22
lines changed

2 files changed

+1
-22
lines changed

include/nbl/builtin/glsl/ext/FFT/default_compute_fft.comp

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
#ifndef USE_SSBO_FOR_INPUT
2-
#error "USE_SSBO_FOR_INPUT should be defined."
3-
#endif
4-
51
#ifndef _NBL_GLSL_WORKGROUP_SIZE_
62
#define _NBL_GLSL_WORKGROUP_SIZE_ 256
73
#endif
@@ -26,14 +22,11 @@ layout(local_size_x=_NBL_GLSL_WORKGROUP_SIZE_, local_size_y=1, local_size_z=1) i
2622
#ifndef _NBL_GLSL_EXT_FFT_INPUT_DESCRIPTOR_DEFINED_
2723
#define _NBL_GLSL_EXT_FFT_INPUT_DESCRIPTOR_DEFINED_
2824

29-
#if USE_SSBO_FOR_INPUT > 0
25+
3026
layout(set=_NBL_GLSL_EXT_FFT_INPUT_SET_DEFINED_, binding=_NBL_GLSL_EXT_FFT_INPUT_BINDING_DEFINED_) readonly restrict buffer InputBuffer
3127
{
3228
nbl_glsl_complex inData[];
3329
};
34-
#else
35-
layout(set=_NBL_GLSL_EXT_FFT_INPUT_SET_DEFINED_, binding=_NBL_GLSL_EXT_FFT_INPUT_BINDING_DEFINED_) uniform sampler2D inputImage;
36-
#endif
3730

3831
#endif
3932

@@ -71,16 +64,9 @@ layout(push_constant) uniform PushConstants
7164
nbl_glsl_complex nbl_glsl_ext_FFT_getData(in uvec3 coordinate, in uint channel)
7265
{
7366
nbl_glsl_complex retValue = nbl_glsl_complex(0, 0);
74-
#if USE_SSBO_FOR_INPUT > 0
7567
uvec3 dimension = nbl_glsl_ext_FFT_Parameters_t_getDimensions();
7668
uint index = channel * (dimension.x * dimension.y * dimension.z) + coordinate.z * (dimension.x * dimension.y) + coordinate.y * (dimension.x) + coordinate.x;
7769
retValue = inData[index];
78-
#else
79-
ivec2 inputImageSize = textureSize(inputImage, 0);
80-
vec2 normalizedCoords = (vec2(coordinate.xy) + vec2(0.5f)) / vec2(inputImageSize);
81-
vec4 texelValue= textureLod(inputImage, normalizedCoords, 0);
82-
retValue = nbl_glsl_complex(texelValue[channel], 0.0f);
83-
#endif
8470
return retValue;
8571
}
8672

@@ -93,7 +79,6 @@ void nbl_glsl_ext_FFT_setData(in uvec3 coordinate, in uint channel, in nbl_glsl_
9379

9480
nbl_glsl_complex nbl_glsl_ext_FFT_getPaddedData(in uvec3 coordinate, in uint channel)
9581
{
96-
#if USE_SSBO_FOR_INPUT > 0
9782
uvec3 max_coord = nbl_glsl_ext_FFT_Parameters_t_getDimensions() - uvec3(1u);
9883
uvec3 clamped_coord = min(coordinate, max_coord);
9984

@@ -106,16 +91,11 @@ nbl_glsl_complex nbl_glsl_ext_FFT_getPaddedData(in uvec3 coordinate, in uint cha
10691
}
10792

10893
return nbl_glsl_ext_FFT_getData(clamped_coord, channel);
109-
#else
110-
return nbl_glsl_ext_FFT_getData(coordinate, channel);
111-
#endif
11294
}
11395

11496
void main()
11597
{
11698
const uint numChannels = nbl_glsl_ext_FFT_Parameters_t_getNumChannels();
11799
for(uint ch = 0u; ch < numChannels; ++ch)
118-
{
119100
nbl_glsl_ext_FFT(nbl_glsl_ext_FFT_Parameters_t_getIsInverse(), ch);
120-
}
121101
}

src/nbl/ext/FFT/FFT.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ core::smart_refctd_ptr<video::IGPUComputePipeline> FFT::getDefaultPipeline(video
6868
const char* sourceFmt =
6969
R"===(#version 430 core
7070
71-
#define USE_SSBO_FOR_INPUT 1
7271
#define _NBL_GLSL_WORKGROUP_SIZE_ %u
7372
#define _NBL_GLSL_EXT_FFT_MAX_DIM_SIZE_ %u
7473

0 commit comments

Comments
 (0)