From 3b05409eff81d2d717e83520d484d46593c362c5 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Mon, 9 Jul 2018 16:16:37 +0100
Subject: [PATCH] Re-use glClear bitfield stringise for glBlitFramebuffer

---
 renderdoc/driver/gl/gl_common.h                |  6 ++++++
 renderdoc/driver/gl/wrappers/gl_draw_funcs.cpp | 18 ++++++------------
 .../gl/wrappers/gl_framebuffer_funcs.cpp       |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/renderdoc/driver/gl/gl_common.h b/renderdoc/driver/gl/gl_common.h
index 31a724531..efaa217a9 100644
--- a/renderdoc/driver/gl/gl_common.h
+++ b/renderdoc/driver/gl/gl_common.h
@@ -571,6 +571,12 @@ enum AttribType
 
 DECLARE_REFLECTION_ENUM(AttribType);
 
+enum GLframebufferbitfield
+{
+};
+
+DECLARE_REFLECTION_ENUM(GLframebufferbitfield);
+
 extern int GLCoreVersion;
 extern bool GLIsCore;
 extern bool IsGLES;
diff --git a/renderdoc/driver/gl/wrappers/gl_draw_funcs.cpp b/renderdoc/driver/gl/wrappers/gl_draw_funcs.cpp
index e70b820dd..fab03e825 100644
--- a/renderdoc/driver/gl/wrappers/gl_draw_funcs.cpp
+++ b/renderdoc/driver/gl/wrappers/gl_draw_funcs.cpp
@@ -74,20 +74,14 @@ std::string DoStringise(const GLbarrierbitfield &el)
   END_BITFIELD_STRINGISE();
 }
 
-enum GLclearbitfield
-{
-};
-
-DECLARE_REFLECTION_ENUM(GLclearbitfield);
-
 template <>
-std::string DoStringise(const GLclearbitfield &el)
+std::string DoStringise(const GLframebufferbitfield &el)
 {
-  RDCCOMPILE_ASSERT(
-      sizeof(GLclearbitfield) == sizeof(GLbitfield) && sizeof(GLclearbitfield) == sizeof(uint32_t),
-      "Fake bitfield enum must be uint32_t sized");
+  RDCCOMPILE_ASSERT(sizeof(GLframebufferbitfield) == sizeof(GLbitfield) &&
+                        sizeof(GLframebufferbitfield) == sizeof(uint32_t),
+                    "Fake bitfield enum must be uint32_t sized");
 
-  BEGIN_BITFIELD_STRINGISE(GLclearbitfield);
+  BEGIN_BITFIELD_STRINGISE(GLframebufferbitfield);
   {
     STRINGISE_BITFIELD_BIT(GL_COLOR_BUFFER_BIT);
     STRINGISE_BITFIELD_BIT(GL_DEPTH_BUFFER_BIT);
@@ -4077,7 +4071,7 @@ void WrappedOpenGL::glClearBufferSubData(GLenum target, GLenum internalformat, G
 template <typename SerialiserType>
 bool WrappedOpenGL::Serialise_glClear(SerialiserType &ser, GLbitfield mask)
 {
-  SERIALISE_ELEMENT_TYPED(GLclearbitfield, mask);
+  SERIALISE_ELEMENT_TYPED(GLframebufferbitfield, mask);
 
   Serialise_DebugMessages(ser);
 
diff --git a/renderdoc/driver/gl/wrappers/gl_framebuffer_funcs.cpp b/renderdoc/driver/gl/wrappers/gl_framebuffer_funcs.cpp
index d93f4ec2f..2f03bf517 100644
--- a/renderdoc/driver/gl/wrappers/gl_framebuffer_funcs.cpp
+++ b/renderdoc/driver/gl/wrappers/gl_framebuffer_funcs.cpp
@@ -1794,7 +1794,7 @@ bool WrappedOpenGL::Serialise_glBlitNamedFramebuffer(SerialiserType &ser,
   SERIALISE_ELEMENT(dstY0);
   SERIALISE_ELEMENT(dstX1);
   SERIALISE_ELEMENT(dstY1);
-  SERIALISE_ELEMENT(mask);
+  SERIALISE_ELEMENT_TYPED(GLframebufferbitfield, mask);
   SERIALISE_ELEMENT(filter);
 
   SERIALISE_CHECK_READ_ERRORS();