diff --git a/apps/gl/coherent_memory_read.cpp b/apps/gl/coherent_memory_read.cpp
index 5f94af9..3156d37 100644
--- a/apps/gl/coherent_memory_read.cpp
+++ b/apps/gl/coherent_memory_read.cpp
@@ -406,7 +406,7 @@ int main(int argc, char** argv)
     glfwInit();
     glfwWindowHint(GLFW_VISIBLE, GLFW_TRUE);
     glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 4);
-    glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
+    glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 4);
     glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE);
     glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
 
diff --git a/apps/gl/coherent_memory_write.cpp b/apps/gl/coherent_memory_write.cpp
index f5c3017..df17c0d 100644
--- a/apps/gl/coherent_memory_write.cpp
+++ b/apps/gl/coherent_memory_write.cpp
@@ -167,8 +167,8 @@ setup_buffers(const int width, const int height, const size_t mapping_offset,
         glBufferStorage(GL_SHADER_STORAGE_BUFFER, size + mapping_offset, NULL,
             mapping_flags);
 
-        coherent_colors[i] = glMapNamedBufferRange(ssbo[i], mapping_offset, size,
-            mapping_flags);
+        coherent_colors[i] = glMapBufferRange(GL_SHADER_STORAGE_BUFFER, mapping_offset,
+            size, mapping_flags);
 
         glBindBuffer(GL_SHADER_STORAGE_BUFFER, 0);
 
@@ -386,7 +386,7 @@ unmap_buffers(const int width, const int height, const size_t mapping_offset) {
         glBindBufferRange(GL_SHADER_STORAGE_BUFFER, i, ssbo[i],
             mapping_offset, size);
 
-        glUnmapNamedBuffer(ssbo[i]);
+        glUnmapBuffer(GL_SHADER_STORAGE_BUFFER);
         glBindBufferBase(GL_SHADER_STORAGE_BUFFER, i, 0);
     }
 
@@ -403,7 +403,7 @@ main(int argc, char** argv) {
 
     glfwWindowHint(GLFW_VISIBLE, GLFW_TRUE);
     glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 4);
-    glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
+    glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 4);
     glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE);
     glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
 
diff --git a/apps/gl/coherent_memory_write.ref.txt b/apps/gl/coherent_memory_write.ref.txt
index a661461..d826b05 100644
--- a/apps/gl/coherent_memory_write.ref.txt
+++ b/apps/gl/coherent_memory_write.ref.txt
@@ -46,17 +46,17 @@ glDeleteShader(shader = <>)
 glGenBuffers(n = 3, buffers = {1, 2, 3})
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glGenFramebuffers(n = 1, framebuffers = &<>)
@@ -226,13 +226,13 @@ glBindVertexArray(array = 0)
 glReadBuffer(mode = GL_COLOR_ATTACHMENT0)
 glReadPixels(x = 0, y = 0, width = 256, height = 256, format = GL_RGBA, type = GL_FLOAT, pixels = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>)
 glBindVertexArray(array = 1)
 glBindBuffer(target = GL_ARRAY_BUFFER, buffer = <>)
@@ -242,17 +242,17 @@ glBindVertexArray(array = 0)
 glGenBuffers(n = 3, buffers = {5, 6, 7})
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glGenFramebuffers(n = 1, framebuffers = &<>)
@@ -422,13 +422,13 @@ glBindVertexArray(array = 0)
 glReadBuffer(mode = GL_COLOR_ATTACHMENT0)
 glReadPixels(x = 0, y = 0, width = 256, height = 256, format = GL_RGBA, type = GL_FLOAT, pixels = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>)
 glBindVertexArray(array = 2)
 glBindBuffer(target = GL_ARRAY_BUFFER, buffer = <>)
@@ -438,17 +438,17 @@ glBindVertexArray(array = 0)
 glGenBuffers(n = 3, buffers = {9, 10, 11})
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glGenFramebuffers(n = 1, framebuffers = &<>)
@@ -618,13 +618,13 @@ glBindVertexArray(array = 0)
 glReadBuffer(mode = GL_COLOR_ATTACHMENT0)
 glReadPixels(x = 0, y = 0, width = 256, height = 256, format = GL_RGBA, type = GL_FLOAT, pixels = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>)
 glBindVertexArray(array = 3)
 glBindBuffer(target = GL_ARRAY_BUFFER, buffer = <>)
@@ -634,17 +634,17 @@ glBindVertexArray(array = 0)
 glGenBuffers(n = 3, buffers = {13, 14, 15})
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glGenFramebuffers(n = 1, framebuffers = &<>)
@@ -814,13 +814,13 @@ glBindVertexArray(array = 0)
 glReadBuffer(mode = GL_COLOR_ATTACHMENT0)
 glReadPixels(x = 0, y = 0, width = 256, height = 256, format = GL_RGBA, type = GL_FLOAT, pixels = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>)
 glBindVertexArray(array = 4)
 glBindBuffer(target = GL_ARRAY_BUFFER, buffer = <>)
@@ -830,17 +830,17 @@ glBindVertexArray(array = 0)
 glGenBuffers(n = 3, buffers = {17, 18, 19})
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glGenFramebuffers(n = 1, framebuffers = &<>)
@@ -1010,13 +1010,13 @@ glBindVertexArray(array = 0)
 glReadBuffer(mode = GL_COLOR_ATTACHMENT0)
 glReadPixels(x = 0, y = 0, width = 256, height = 256, format = GL_RGBA, type = GL_FLOAT, pixels = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>)
 glBindVertexArray(array = 5)
 glBindBuffer(target = GL_ARRAY_BUFFER, buffer = <>)
@@ -1026,17 +1026,17 @@ glBindVertexArray(array = 0)
 glGenBuffers(n = 3, buffers = {21, 22, 23})
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glGenFramebuffers(n = 1, framebuffers = &<>)
@@ -1206,13 +1206,13 @@ glBindVertexArray(array = 0)
 glReadBuffer(mode = GL_COLOR_ATTACHMENT0)
 glReadPixels(x = 0, y = 0, width = 256, height = 256, format = GL_RGBA, type = GL_FLOAT, pixels = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>)
 glBindVertexArray(array = 6)
 glBindBuffer(target = GL_ARRAY_BUFFER, buffer = <>)
@@ -1222,17 +1222,17 @@ glBindVertexArray(array = 0)
 glGenBuffers(n = 3, buffers = {25, 26, 27})
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glGenFramebuffers(n = 1, framebuffers = &<>)
@@ -1402,13 +1402,13 @@ glBindVertexArray(array = 0)
 glReadBuffer(mode = GL_COLOR_ATTACHMENT0)
 glReadPixels(x = 0, y = 0, width = 256, height = 256, format = GL_RGBA, type = GL_FLOAT, pixels = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>)
 glBindVertexArray(array = 7)
 glBindBuffer(target = GL_ARRAY_BUFFER, buffer = <>)
@@ -1418,17 +1418,17 @@ glBindVertexArray(array = 0)
 glGenBuffers(n = 3, buffers = {29, 30, 31})
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glGenFramebuffers(n = 1, framebuffers = &<>)
@@ -1598,13 +1598,13 @@ glBindVertexArray(array = 0)
 glReadBuffer(mode = GL_COLOR_ATTACHMENT0)
 glReadPixels(x = 0, y = 0, width = 256, height = 256, format = GL_RGBA, type = GL_FLOAT, pixels = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>)
 glBindVertexArray(array = 8)
 glBindBuffer(target = GL_ARRAY_BUFFER, buffer = <>)
@@ -1614,17 +1614,17 @@ glBindVertexArray(array = 0)
 glGenBuffers(n = 3, buffers = {33, 34, 35})
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glGenFramebuffers(n = 1, framebuffers = &<>)
@@ -1794,13 +1794,13 @@ glBindVertexArray(array = 0)
 glReadBuffer(mode = GL_COLOR_ATTACHMENT0)
 glReadPixels(x = 0, y = 0, width = 256, height = 256, format = GL_RGBA, type = GL_FLOAT, pixels = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>)
 glBindVertexArray(array = 9)
 glBindBuffer(target = GL_ARRAY_BUFFER, buffer = <>)
@@ -1810,17 +1810,17 @@ glBindVertexArray(array = 0)
 glGenBuffers(n = 3, buffers = {37, 38, 39})
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glGenFramebuffers(n = 1, framebuffers = &<>)
@@ -1990,13 +1990,13 @@ glBindVertexArray(array = 0)
 glReadBuffer(mode = GL_COLOR_ATTACHMENT0)
 glReadPixels(x = 0, y = 0, width = 256, height = 256, format = GL_RGBA, type = GL_FLOAT, pixels = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>)
 glBindVertexArray(array = 10)
 glBindBuffer(target = GL_ARRAY_BUFFER, buffer = <>)
@@ -2006,17 +2006,17 @@ glBindVertexArray(array = 0)
 glGenBuffers(n = 3, buffers = {41, 42, 43})
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glGenFramebuffers(n = 1, framebuffers = &<>)
@@ -2186,13 +2186,13 @@ glBindVertexArray(array = 0)
 glReadBuffer(mode = GL_COLOR_ATTACHMENT0)
 glReadPixels(x = 0, y = 0, width = 256, height = 256, format = GL_RGBA, type = GL_FLOAT, pixels = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>)
 glBindVertexArray(array = 11)
 glBindBuffer(target = GL_ARRAY_BUFFER, buffer = <>)
@@ -2202,17 +2202,17 @@ glBindVertexArray(array = 0)
 glGenBuffers(n = 3, buffers = {45, 46, 47})
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glGenFramebuffers(n = 1, framebuffers = &<>)
@@ -2382,13 +2382,13 @@ glBindVertexArray(array = 0)
 glReadBuffer(mode = GL_COLOR_ATTACHMENT0)
 glReadPixels(x = 0, y = 0, width = 256, height = 256, format = GL_RGBA, type = GL_FLOAT, pixels = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>)
 glBindVertexArray(array = 12)
 glBindBuffer(target = GL_ARRAY_BUFFER, buffer = <>)
@@ -2398,17 +2398,17 @@ glBindVertexArray(array = 0)
 glGenBuffers(n = 3, buffers = {49, 50, 51})
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glGenFramebuffers(n = 1, framebuffers = &<>)
@@ -2578,13 +2578,13 @@ glBindVertexArray(array = 0)
 glReadBuffer(mode = GL_COLOR_ATTACHMENT0)
 glReadPixels(x = 0, y = 0, width = 256, height = 256, format = GL_RGBA, type = GL_FLOAT, pixels = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>)
 glBindVertexArray(array = 13)
 glBindBuffer(target = GL_ARRAY_BUFFER, buffer = <>)
@@ -2594,17 +2594,17 @@ glBindVertexArray(array = 0)
 glGenBuffers(n = 3, buffers = {53, 54, 55})
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glGenFramebuffers(n = 1, framebuffers = &<>)
@@ -2774,13 +2774,13 @@ glBindVertexArray(array = 0)
 glReadBuffer(mode = GL_COLOR_ATTACHMENT0)
 glReadPixels(x = 0, y = 0, width = 256, height = 256, format = GL_RGBA, type = GL_FLOAT, pixels = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>)
 glBindVertexArray(array = 14)
 glBindBuffer(target = GL_ARRAY_BUFFER, buffer = <>)
@@ -2790,17 +2790,17 @@ glBindVertexArray(array = 0)
 glGenBuffers(n = 3, buffers = {57, 58, 59})
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glGenFramebuffers(n = 1, framebuffers = &<>)
@@ -2970,13 +2970,13 @@ glBindVertexArray(array = 0)
 glReadBuffer(mode = GL_COLOR_ATTACHMENT0)
 glReadPixels(x = 0, y = 0, width = 256, height = 256, format = GL_RGBA, type = GL_FLOAT, pixels = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>)
 glBindVertexArray(array = 15)
 glBindBuffer(target = GL_ARRAY_BUFFER, buffer = <>)
@@ -2986,17 +2986,17 @@ glBindVertexArray(array = 0)
 glGenBuffers(n = 3, buffers = {61, 62, 63})
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glGenFramebuffers(n = 1, framebuffers = &<>)
@@ -3166,13 +3166,13 @@ glBindVertexArray(array = 0)
 glReadBuffer(mode = GL_COLOR_ATTACHMENT0)
 glReadPixels(x = 0, y = 0, width = 256, height = 256, format = GL_RGBA, type = GL_FLOAT, pixels = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>)
 glBindVertexArray(array = 16)
 glBindBuffer(target = GL_ARRAY_BUFFER, buffer = <>)
@@ -3182,17 +3182,17 @@ glBindVertexArray(array = 0)
 glGenBuffers(n = 3, buffers = {65, 66, 67})
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glGenFramebuffers(n = 1, framebuffers = &<>)
@@ -3362,13 +3362,13 @@ glBindVertexArray(array = 0)
 glReadBuffer(mode = GL_COLOR_ATTACHMENT0)
 glReadPixels(x = 0, y = 0, width = 256, height = 256, format = GL_RGBA, type = GL_FLOAT, pixels = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>)
 glBindVertexArray(array = 17)
 glBindBuffer(target = GL_ARRAY_BUFFER, buffer = <>)
@@ -3378,17 +3378,17 @@ glBindVertexArray(array = 0)
 glGenBuffers(n = 3, buffers = {69, 70, 71})
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>, offset = <>, size = <>)
 glBufferStorage(target = GL_SHADER_STORAGE_BUFFER, size = <>, data = NULL, flags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT)
-glMapNamedBufferRange(buffer = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
+glMapBufferRange(target = <>, offset = <>, length = <>, access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT) = <>
 glBindBuffer(target = GL_SHADER_STORAGE_BUFFER, buffer = <>)
 glGetError() = GL_NO_ERROR
 glGenFramebuffers(n = 1, framebuffers = &<>)
@@ -3558,13 +3558,13 @@ glBindVertexArray(array = 0)
 glReadBuffer(mode = GL_COLOR_ATTACHMENT0)
 glReadPixels(x = 0, y = 0, width = 256, height = 256, format = GL_RGBA, type = GL_FLOAT, pixels = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 0, buffer = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 1, buffer = <>)
 glBindBufferRange(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>, offset = <>, size = <>)
-glUnmapNamedBuffer(buffer = <>) = GL_TRUE
+glUnmapBuffer(target = <>) = GL_TRUE
 glBindBufferBase(target = GL_SHADER_STORAGE_BUFFER, index = 2, buffer = <>)
 glBindVertexArray(array = 18)
 glBindBuffer(target = GL_ARRAY_BUFFER, buffer = <>)