From 0f403fc2013aefc8dc0af1ba417c9d02835fc8b5 Mon Sep 17 00:00:00 2001
From: zephyrxiao <zephyrxiao@tencent.com>
Date: Mon, 22 Nov 2021 16:50:33 +0800
Subject: [PATCH] Fix EXT_map_buffer_range alias

glMapBufferRangeEXT and glFlushMappedBufferRangeEXT are aliases of glMapBufferRange and glFlushMappedBufferRange repectively.
---
 renderdoc/driver/gl/gl_common.h              | 3 +++
 renderdoc/driver/gl/gl_dispatch_table.h      | 4 ++--
 renderdoc/driver/gl/gl_dispatch_table_defs.h | 8 ++++----
 renderdoc/driver/gl/gl_driver.cpp            | 2 ++
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/renderdoc/driver/gl/gl_common.h b/renderdoc/driver/gl/gl_common.h
index 973e95ea1..2c09241c9 100644
--- a/renderdoc/driver/gl/gl_common.h
+++ b/renderdoc/driver/gl/gl_common.h
@@ -2232,6 +2232,9 @@ enum class GLChunk : uint32_t
 
   ImplicitThreadSwitch,
 
+  glMapBufferRangeEXT,
+  glFlushMappedBufferRangeEXT,
+
   Max,
 };
 
diff --git a/renderdoc/driver/gl/gl_dispatch_table.h b/renderdoc/driver/gl/gl_dispatch_table.h
index 33c75dddd..9430f3107 100644
--- a/renderdoc/driver/gl/gl_dispatch_table.h
+++ b/renderdoc/driver/gl/gl_dispatch_table.h
@@ -337,8 +337,8 @@ struct GLDispatchTable
   PFNGLBINDBUFFERSBASEPROC glBindBuffersBase;
   PFNGLBINDBUFFERSRANGEPROC glBindBuffersRange;
   PFNGLMAPBUFFERPROC glMapBuffer;    // aliases glMapBufferARB, glMapBufferOES
-  PFNGLMAPBUFFERRANGEPROC glMapBufferRange;
-  PFNGLFLUSHMAPPEDBUFFERRANGEPROC glFlushMappedBufferRange;
+  PFNGLMAPBUFFERRANGEPROC glMapBufferRange;    // aliases glMapBufferRangeEXT
+  PFNGLFLUSHMAPPEDBUFFERRANGEPROC glFlushMappedBufferRange;    // aliases glFlushMappedBufferRangeEXT
   PFNGLUNMAPBUFFERPROC glUnmapBuffer;    // aliases glUnmapBufferARB, glUnmapBufferOES
   PFNGLTRANSFORMFEEDBACKVARYINGSPROC glTransformFeedbackVaryings;    // aliases glTransformFeedbackVaryingsEXT
   PFNGLGENTRANSFORMFEEDBACKSPROC glGenTransformFeedbacks;
diff --git a/renderdoc/driver/gl/gl_dispatch_table_defs.h b/renderdoc/driver/gl/gl_dispatch_table_defs.h
index 60aaa9432..6dfae8201 100644
--- a/renderdoc/driver/gl/gl_dispatch_table_defs.h
+++ b/renderdoc/driver/gl/gl_dispatch_table_defs.h
@@ -506,7 +506,9 @@
   FUNC(glMapBuffer, glMapBufferARB); \
   FUNC(glMapBuffer, glMapBufferOES); \
   FUNC(glMapBufferRange, glMapBufferRange); \
+  FUNC(glMapBufferRange, glMapBufferRangeEXT); \
   FUNC(glFlushMappedBufferRange, glFlushMappedBufferRange); \
+  FUNC(glFlushMappedBufferRange, glFlushMappedBufferRangeEXT); \
   FUNC(glUnmapBuffer, glUnmapBuffer); \
   FUNC(glUnmapBuffer, glUnmapBufferARB); \
   FUNC(glUnmapBuffer, glUnmapBufferOES); \
@@ -1767,7 +1769,9 @@
   AliasWrapper2(void *, glMapBufferARB, glMapBuffer, GLenum, target, GLenum, access); \
   AliasWrapper2(void *, glMapBufferOES, glMapBuffer, GLenum, target, GLenum, access); \
   FuncWrapper4(void *, glMapBufferRange, GLenum, target, GLintptr, offset, GLsizeiptr, length, GLbitfield, access); \
+  AliasWrapper4(void *, glMapBufferRangeEXT, glMapBufferRange, GLenum, target, GLintptr, offset, GLsizeiptr, length, GLbitfield, access); \
   FuncWrapper3(void, glFlushMappedBufferRange, GLenum, target, GLintptr, offset, GLsizeiptr, length); \
+  AliasWrapper3(void, glFlushMappedBufferRangeEXT, glFlushMappedBufferRange, GLenum, target, GLintptr, offset, GLsizeiptr, length); \
   FuncWrapper1(GLboolean, glUnmapBuffer, GLenum, target); \
   AliasWrapper1(GLboolean, glUnmapBufferARB, glUnmapBuffer, GLenum, target); \
   AliasWrapper1(GLboolean, glUnmapBufferOES, glUnmapBuffer, GLenum, target); \
@@ -2925,7 +2929,6 @@
   FUNC(glFinishObjectAPPLE); \
   FUNC(glFinishTextureSUNX); \
   FUNC(glFlushMappedBufferRangeAPPLE); \
-  FUNC(glFlushMappedBufferRangeEXT); \
   FUNC(glFlushPixelDataRangeNV); \
   FUNC(glFlushRasterSGIX); \
   FUNC(glFlushStaticDataIBM); \
@@ -3387,7 +3390,6 @@
   FUNC(glMap2d); \
   FUNC(glMap2f); \
   FUNC(glMap2xOES); \
-  FUNC(glMapBufferRangeEXT); \
   FUNC(glMapControlPointsNV); \
   FUNC(glMapGrid1d); \
   FUNC(glMapGrid1f); \
@@ -4837,7 +4839,6 @@
   UnsupportedWrapper2(void, glFinishObjectAPPLE, GLenum, object, GLint, name); \
   UnsupportedWrapper0(void, glFinishTextureSUNX); \
   UnsupportedWrapper3(void, glFlushMappedBufferRangeAPPLE, GLenum, target, GLintptr, offset, GLsizeiptr, size); \
-  UnsupportedWrapper3(void, glFlushMappedBufferRangeEXT, GLenum, target, GLintptr, offset, GLsizeiptr, length); \
   UnsupportedWrapper1(void, glFlushPixelDataRangeNV, GLenum, target); \
   UnsupportedWrapper0(void, glFlushRasterSGIX); \
   UnsupportedWrapper1(void, glFlushStaticDataIBM, GLenum, target); \
@@ -5299,7 +5300,6 @@
   UnsupportedWrapper10(void, glMap2d, GLenum, target, GLdouble, u1, GLdouble, u2, GLint, ustride, GLint, uorder, GLdouble, v1, GLdouble, v2, GLint, vstride, GLint, vorder, const GLdouble *, points); \
   UnsupportedWrapper10(void, glMap2f, GLenum, target, GLfloat, u1, GLfloat, u2, GLint, ustride, GLint, uorder, GLfloat, v1, GLfloat, v2, GLint, vstride, GLint, vorder, const GLfloat *, points); \
   UnsupportedWrapper10(void, glMap2xOES, GLenum, target, GLfixed, u1, GLfixed, u2, GLint, ustride, GLint, uorder, GLfixed, v1, GLfixed, v2, GLint, vstride, GLint, vorder, GLfixed, points); \
-  UnsupportedWrapper4(void *, glMapBufferRangeEXT, GLenum, target, GLintptr, offset, GLsizeiptr, length, GLbitfield, access); \
   UnsupportedWrapper9(void, glMapControlPointsNV, GLenum, target, GLuint, index, GLenum, type, GLsizei, ustride, GLsizei, vstride, GLint, uorder, GLint, vorder, GLboolean, packed, const void *, points); \
   UnsupportedWrapper3(void, glMapGrid1d, GLint, un, GLdouble, u1, GLdouble, u2); \
   UnsupportedWrapper3(void, glMapGrid1f, GLint, un, GLfloat, u1, GLfloat, u2); \
diff --git a/renderdoc/driver/gl/gl_driver.cpp b/renderdoc/driver/gl/gl_driver.cpp
index 772b76e37..bdc9da3d9 100644
--- a/renderdoc/driver/gl/gl_driver.cpp
+++ b/renderdoc/driver/gl/gl_driver.cpp
@@ -3595,6 +3595,7 @@ bool WrappedOpenGL::ProcessChunk(ReadSerialiser &ser, GLChunk chunk)
     case GLChunk::glUnmapNamedBufferEXT: return Serialise_glUnmapNamedBufferEXT(ser, 0);
     case GLChunk::CoherentMapWrite:
     case GLChunk::glFlushMappedBufferRange:
+    case GLChunk::glFlushMappedBufferRangeEXT:
     case GLChunk::glFlushMappedNamedBufferRange:
     case GLChunk::glFlushMappedNamedBufferRangeEXT:
       return Serialise_glFlushMappedNamedBufferRangeEXT(ser, 0, 0, 0);
@@ -5015,6 +5016,7 @@ bool WrappedOpenGL::ProcessChunk(ReadSerialiser &ser, GLChunk chunk)
     case GLChunk::glMapBufferARB:
     case GLChunk::glMapBufferOES:
     case GLChunk::glMapBufferRange:
+    case GLChunk::glMapBufferRangeEXT:
     case GLChunk::glMapNamedBuffer:
     case GLChunk::glMapNamedBufferEXT:
     case GLChunk::glMapNamedBufferRange: