From bb3decb9830b1dde03c3114ef5c4960fc3f7aa4b Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Thu, 19 Mar 2020 00:07:48 +0000 Subject: [PATCH] video_core: don't use NULL for non-pointer after a7d3489dc987 src/video_core/renderer_opengl/texture_filters/bicubic/bicubic.cpp:51:86: error: cannot initialize a parameter of type 'GLuint' (aka 'unsigned int') with an rvalue of type 'nullptr_t' glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, NULL, 0); ^~~~ src/video_core/renderer_opengl/texture_filters/xbrz/xbrz_freescale.cpp:95:86: error: cannot initialize a parameter of type 'GLuint' (aka 'unsigned int') with an rvalue of type 'nullptr_t' glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, NULL, 0); ^~~~ /usr/include/sys/_null.h:37:14: note: expanded from macro 'NULL' #define NULL nullptr ^~~~~~~ --- .../renderer_opengl/texture_filters/bicubic/bicubic.cpp | 2 +- .../renderer_opengl/texture_filters/xbrz/xbrz_freescale.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/video_core/renderer_opengl/texture_filters/bicubic/bicubic.cpp b/src/video_core/renderer_opengl/texture_filters/bicubic/bicubic.cpp index 16f5bd2c58..6c0bc1f82b 100644 --- a/src/video_core/renderer_opengl/texture_filters/bicubic/bicubic.cpp +++ b/src/video_core/renderer_opengl/texture_filters/bicubic/bicubic.cpp @@ -48,7 +48,7 @@ void Bicubic::scale(CachedSurface& surface, const Common::Rectangle& rect, glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, cur_state.texture_units[0].texture_2d, 0); glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); - glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, NULL, 0); + glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, 0, 0); cur_state.Apply(); } diff --git a/src/video_core/renderer_opengl/texture_filters/xbrz/xbrz_freescale.cpp b/src/video_core/renderer_opengl/texture_filters/xbrz/xbrz_freescale.cpp index 0916666273..5e7c34d1d6 100644 --- a/src/video_core/renderer_opengl/texture_filters/xbrz/xbrz_freescale.cpp +++ b/src/video_core/renderer_opengl/texture_filters/xbrz/xbrz_freescale.cpp @@ -92,7 +92,7 @@ void XbrzFreescale::scale(CachedSurface& surface, const Common::Rectangle& glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, cur_state.texture_units[0].texture_2d, 0); glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); - glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, NULL, 0); + glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, 0, 0); cur_state.Apply(); }