From 31f67f4c192d8b3939c170e89adbb727e3321c99 Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Mon, 19 Jun 2017 17:45:54 +0200 Subject: [PATCH] Add fallthrough comments to fix gcc warnings --- .../Windows/Dialogs/VirtualFileDialog.cpp | 1 + .../driver/gl/wrappers/gl_debug_funcs.cpp | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/qrenderdoc/Windows/Dialogs/VirtualFileDialog.cpp b/qrenderdoc/Windows/Dialogs/VirtualFileDialog.cpp index 8b94b53e4..d3b375be2 100644 --- a/qrenderdoc/Windows/Dialogs/VirtualFileDialog.cpp +++ b/qrenderdoc/Windows/Dialogs/VirtualFileDialog.cpp @@ -341,6 +341,7 @@ public: else return fileIcon[hideIndex]; } + break; case Qt::TextAlignmentRole: if(index.column() == 1) return Qt::AlignRight; diff --git a/renderdoc/driver/gl/wrappers/gl_debug_funcs.cpp b/renderdoc/driver/gl/wrappers/gl_debug_funcs.cpp index 1ab13db81..de8c491d6 100644 --- a/renderdoc/driver/gl/wrappers/gl_debug_funcs.cpp +++ b/renderdoc/driver/gl/wrappers/gl_debug_funcs.cpp @@ -45,21 +45,27 @@ bool WrappedOpenGL::Serialise_glObjectLabel(GLenum identifier, GLuint name, GLsi switch(identifier) { case eGL_TEXTURE: liveid = GetResourceManager()->GetID(TextureRes(GetCtx(), name)); break; - case eGL_BUFFER_OBJECT_EXT: extvariant = true; + case eGL_BUFFER_OBJECT_EXT: + extvariant = true; // intentional fallthrough case eGL_BUFFER: liveid = GetResourceManager()->GetID(BufferRes(GetCtx(), name)); break; - case eGL_PROGRAM_OBJECT_EXT: extvariant = true; + case eGL_PROGRAM_OBJECT_EXT: + extvariant = true; // intentional fallthrough case eGL_PROGRAM: liveid = GetResourceManager()->GetID(ProgramRes(GetCtx(), name)); break; - case eGL_PROGRAM_PIPELINE_OBJECT_EXT: extvariant = true; + case eGL_PROGRAM_PIPELINE_OBJECT_EXT: + extvariant = true; // intentional fallthrough case eGL_PROGRAM_PIPELINE: liveid = GetResourceManager()->GetID(ProgramPipeRes(GetCtx(), name)); break; - case eGL_VERTEX_ARRAY_OBJECT_EXT: extvariant = true; + case eGL_VERTEX_ARRAY_OBJECT_EXT: + extvariant = true; // intentional fallthrough case eGL_VERTEX_ARRAY: liveid = GetResourceManager()->GetID(VertexArrayRes(GetCtx(), name)); break; - case eGL_SHADER_OBJECT_EXT: extvariant = true; + case eGL_SHADER_OBJECT_EXT: + extvariant = true; // intentional fallthrough case eGL_SHADER: liveid = GetResourceManager()->GetID(ShaderRes(GetCtx(), name)); break; - case eGL_QUERY_OBJECT_EXT: extvariant = true; + case eGL_QUERY_OBJECT_EXT: + extvariant = true; // intentional fallthrough case eGL_QUERY: liveid = GetResourceManager()->GetID(QueryRes(GetCtx(), name)); break; case eGL_TRANSFORM_FEEDBACK: liveid = GetResourceManager()->GetID(FeedbackRes(GetCtx(), name));