From 27972ceaa7dcde06609c28d887db87d9247aff27 Mon Sep 17 00:00:00 2001 From: Hermet Park Date: Thu, 22 Feb 2024 12:47:39 +0900 Subject: [PATCH] gl_engine: fix a compile warnings, errors. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ../src/renderer/gl_engine/tvgGlRenderPass.cpp:35:34: warning: macro expands to multiple statements [-Wmultistatement-macros] 35 | if (mColorTex != 0) GL_CHECK(glDeleteTextures(1, &mColorTex)); | ^~~~~~~~~~~~~~~~ ../src/renderer/gl_engine/tvgGlCommon.h:33:9: note: in definition of macro ‘GL_CHECK’ 33 | x; \ | ^ --- src/renderer/gl_engine/tvgGlRenderPass.cpp | 8 ++++++-- src/renderer/gl_engine/tvgGlTessellator.h | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/renderer/gl_engine/tvgGlRenderPass.cpp b/src/renderer/gl_engine/tvgGlRenderPass.cpp index 76ab4349..1eb53f4b 100644 --- a/src/renderer/gl_engine/tvgGlRenderPass.cpp +++ b/src/renderer/gl_engine/tvgGlRenderPass.cpp @@ -32,8 +32,12 @@ GlRenderTarget::~GlRenderTarget() GL_CHECK(glBindFramebuffer(GL_FRAMEBUFFER, 0)); GL_CHECK(glDeleteFramebuffers(1, &mFbo)); - if (mColorTex != 0) GL_CHECK(glDeleteTextures(1, &mColorTex)); - if (mStencilBuffer != 0) GL_CHECK(glDeleteRenderbuffers(1, &mStencilBuffer)); + if (mColorTex != 0) { + GL_CHECK(glDeleteTextures(1, &mColorTex)); + } + if (mStencilBuffer != 0) { + GL_CHECK(glDeleteRenderbuffers(1, &mStencilBuffer)); + } } void GlRenderTarget::init(GLint resolveId) diff --git a/src/renderer/gl_engine/tvgGlTessellator.h b/src/renderer/gl_engine/tvgGlTessellator.h index a4dbf075..83bccec4 100644 --- a/src/renderer/gl_engine/tvgGlTessellator.h +++ b/src/renderer/gl_engine/tvgGlTessellator.h @@ -26,7 +26,7 @@ #include #include "tvgGlGeometry.h" -#include "tvgBezier.h" +#include "tvgLines.h" namespace tvg {