libretro/FFmpeg
1
0 Fork 0
mirror of https://github.com/libretro/FFmpeg.git synced 2026-11-13 15:51:31 -10:00
Code Issues Packages Projects Releases Wiki Activity

(FFT) Use MAX macro

Browse Source
This commit is contained in:
twinaphex committed 2015-06-23 02:49:47 +02:00
1 parent 124def6705
commit ce81522b59
1 file changed
+5 -1
Download Patch File Download Diff File Expand all files Collapse all files
libretro/fft/fft.cpp
+5 -1
View File
@@ -30,6 +30,10 @@ using namespace glm;
#define GL_CHECK_ERROR()
#endif
#ifndef MAX
#define MAX(a, b) ((b > a) ? (b) : (a))
#endif
static const char vertex_program_heightmap[] =
"#version 300 es\n"
"layout(location = 0) in vec2 aVertex;\n"
@@ -598,7 +602,7 @@ void GLFFT::init_fft()
init_texture(input_tex, GL_RG16I, fft_size, 1);
init_target(output, GL_RG32UI, fft_size, fft_depth, 1);
init_target(resolve, GL_RGBA8, fft_size, fft_depth, 1);
init_target(blur, GL_RGBA8, fft_size, fft_depth, log2i(max(fft_size, fft_depth)) + 1, GL_NEAREST, GL_LINEAR_MIPMAP_LINEAR);
init_target(blur, GL_RGBA8, fft_size, fft_depth, log2i(MAX(fft_size, fft_depth)) + 1, GL_NEAREST, GL_LINEAR_MIPMAP_LINEAR);
GL_CHECK_ERROR();
for (unsigned i = 0; i < fft_steps; i++)