Skip to content

Commit 6787cd3

Browse files
forgot to commit changes to ext/LumaMeter/CLumaMeter.cpp and ext/ToneMapper/CToneMapper.cpp
1 parent d853685 commit 6787cd3

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

src/irr/ext/LumaMeter/CLumaMeter.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,15 +103,11 @@ R"===(#version 430 core
103103
#define _IRR_GLSL_EXT_LUMA_METER_DISPATCH_SIZE_Y_DEFINED_ 16
104104
#endif
105105
106-
#define _IRR_GLSL_EXT_LUMA_METER_INVOCATION_COUNT (_IRR_GLSL_EXT_LUMA_METER_DISPATCH_SIZE_X_DEFINED_*_IRR_GLSL_EXT_LUMA_METER_DISPATCH_SIZE_Y_DEFINED_)
106+
#define _IRR_GLSL_WORKGROUP_SIZE_ (_IRR_GLSL_EXT_LUMA_METER_DISPATCH_SIZE_X_DEFINED_*_IRR_GLSL_EXT_LUMA_METER_DISPATCH_SIZE_Y_DEFINED_)
107107
108108
#define _IRR_GLSL_EXT_LUMA_METER_BIN_COUNT %d
109109
#define _IRR_GLSL_EXT_LUMA_METER_BIN_GLOBAL_REPLICATION %d
110110
111-
#if _IRR_GLSL_EXT_LUMA_METER_INVOCATION_COUNT!=_IRR_GLSL_EXT_LUMA_METER_BIN_COUNT
112-
#error "_IRR_GLSL_EXT_LUMA_METER_INVOCATION_COUNT does not equal _IRR_GLSL_EXT_LUMA_METER_BIN_COUNT"
113-
#endif
114-
115111
116112
#define _IRR_GLSL_EXT_LUMA_METER_MIN_LUMA_DEFINED_ %d
117113
#define _IRR_GLSL_EXT_LUMA_METER_MAX_LUMA_DEFINED_ %d

src/irr/ext/ToneMapper/CToneMapper.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ R"===(#version 430 core
243243
%s // _IRR_GLSL_EXT_TONE_MAPPER_USING_LUMA_METER_DEFINED_
244244
245245
#ifdef _IRR_GLSL_EXT_TONE_MAPPER_USING_LUMA_METER_DEFINED_
246-
#define _IRR_GLSL_EXT_LUMA_METER_INVOCATION_COUNT (_IRR_GLSL_EXT_TONE_MAPPER_DISPATCH_SIZE_X_DEFINED_*_IRR_GLSL_EXT_TONE_MAPPER_DISPATCH_SIZE_Y_DEFINED_)
246+
#define _IRR_GLSL_WORKGROUP_SIZE_ (_IRR_GLSL_EXT_TONE_MAPPER_DISPATCH_SIZE_X_DEFINED_*_IRR_GLSL_EXT_TONE_MAPPER_DISPATCH_SIZE_Y_DEFINED_)
247247
248248
#define _IRR_GLSL_EXT_LUMA_METER_BIN_COUNT %d
249249
#define _IRR_GLSL_EXT_LUMA_METER_BIN_GLOBAL_REPLICATION %d

0 commit comments

Comments
 (0)