From 2992e62306c032575087e1f9f22cef1a66450fbe Mon Sep 17 00:00:00 2001 From: Allen Webster Date: Wed, 19 Feb 2020 20:11:18 -0800 Subject: [PATCH] Setup cool new opengl funcs --- custom/generated/command_metadata.h | 2 +- opengl/4ed_opengl_funcs.h | 25 ++++++++++++++++++++----- platform_mac/mac_4ed_opengl_funcs.h | 1 + 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/custom/generated/command_metadata.h b/custom/generated/command_metadata.h index 33fa492a..19059348 100644 --- a/custom/generated/command_metadata.h +++ b/custom/generated/command_metadata.h @@ -479,7 +479,7 @@ static Command_Metadata fcoder_metacmd_table[238] = { { PROC_LINKS(toggle_mouse, 0), false, "toggle_mouse", 12, "Toggles the mouse suppression mode, see suppress_mouse and allow_mouse.", 71, "W:\\4ed\\code\\custom\\4coder_default_framework.cpp", 47, 415 }, { PROC_LINKS(toggle_paren_matching_helper, 0), false, "toggle_paren_matching_helper", 28, "In code files matching parentheses pairs are colored with distinguishing colors.", 80, "W:\\4ed\\code\\custom\\4coder_default_framework.cpp", 47, 445 }, { PROC_LINKS(toggle_show_whitespace, 0), false, "toggle_show_whitespace", 22, "Toggles the current buffer's whitespace visibility status.", 58, "W:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 808 }, -{ PROC_LINKS(toggle_virtual_whitespace, 0), false, "toggle_virtual_whitespace", 25, "Toggles virtual whitespace for all files.", 41, "W:\\4ed\\code\\custom\\4coder_code_index.cpp", 40, 1175 }, +{ PROC_LINKS(toggle_virtual_whitespace, 0), false, "toggle_virtual_whitespace", 25, "Toggles virtual whitespace for all files.", 41, "W:\\4ed\\code\\custom\\4coder_code_index.cpp", 40, 1176 }, { PROC_LINKS(tutorial_maximize, 0), false, "tutorial_maximize", 17, "Expand the tutorial window", 26, "W:\\4ed\\code\\custom\\4coder_tutorial.cpp", 38, 20 }, { PROC_LINKS(tutorial_minimize, 0), false, "tutorial_minimize", 17, "Shrink the tutorial window", 26, "W:\\4ed\\code\\custom\\4coder_tutorial.cpp", 38, 34 }, { PROC_LINKS(uncomment_line, 0), false, "uncomment_line", 14, "If present, delete '//' at the beginning of the line after leading whitespace.", 78, "W:\\4ed\\code\\custom\\4coder_combined_write_commands.cpp", 53, 137 }, diff --git a/opengl/4ed_opengl_funcs.h b/opengl/4ed_opengl_funcs.h index 12d2e74e..4c2e65d8 100644 --- a/opengl/4ed_opengl_funcs.h +++ b/opengl/4ed_opengl_funcs.h @@ -13,19 +13,21 @@ #include "4ed_opengl_funcs.h" */ +#if OS_WINDOWS || OS_LINUX GL_FUNC(glDebugMessageControl, void, (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled)) GL_FUNC(glDebugMessageCallback, void, (GLDEBUGPROC callback, const void *userParam)) -#ifndef OS_LINUX +GL_FUNC(glGenVertexArrays, void, (GLsizei n, GLuint *arrays)) +GL_FUNC(glBindVertexArray, void, (GLuint array)) + +GL_FUNC(glDeleteVertexArrays, void, (GLsizei n, const GLuint *arrays)) + +#if !OS_LINUX GL_FUNC(glTexImage3D, void, (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels)) GL_FUNC(glTexSubImage3D, void, (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels)) GL_FUNC(glActiveTexture, void, (GLenum texture)) #endif -GL_FUNC(glGenVertexArrays, void, (GLsizei n, GLuint *arrays)) -GL_FUNC(glBindVertexArray, void, (GLuint array)) -GL_FUNC(glDeleteVertexArrays, void, (GLsizei n, const GLuint *arrays)) - GL_FUNC(glGenBuffers, void, (GLsizei n, GLuint *buffers)) GL_FUNC(glBindBuffer, void, (GLenum target, GLuint buffer)) GL_FUNC(glBufferData, void, (GLenum target, GLsizeiptr size, const void *data, GLenum usage)) @@ -54,6 +56,7 @@ GL_FUNC(glDisableVertexAttribArray, void, (GLuint index)) GL_FUNC(glEnableVertexAttribArray, void, (GLuint index)) GL_FUNC(glVertexAttribPointer, void, (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void *pointer)) + GL_FUNC(glVertexAttribIPointer, void, (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer)) GL_FUNC(glUniform1f, void, (GLint location, GLfloat v0)) @@ -87,6 +90,18 @@ GL_FUNC(glBlitFramebuffer, void, (GLint srcX0, GLint srcY0, GLint srcX1, GLint s GL_FUNC(glTexImage2DMultisample, void, (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations)) +#elif OS_MAC + +GL_FUNC(glDebugMessageControl, void, (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled)) +GL_FUNC(glDebugMessageCallback, void, (GLDEBUGPROC callback, const void *userParam)) + +GL_FUNC(glGenVertexArrays, void, (GLsizei n, GLuint *arrays)) +GL_FUNC(glBindVertexArray, void, (GLuint array)) + +GL_FUNC(glVertexAttribIPointer, void, (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer)) + +#endif + #undef GL_FUNC // BOTTOM diff --git a/platform_mac/mac_4ed_opengl_funcs.h b/platform_mac/mac_4ed_opengl_funcs.h index 649847f9..3d603e67 100644 --- a/platform_mac/mac_4ed_opengl_funcs.h +++ b/platform_mac/mac_4ed_opengl_funcs.h @@ -6,6 +6,7 @@ #include "4ed_opengl_funcs.h" */ +// TODO(allen): eliminate this GL_FUNC(glDebugMessageControl, void, (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled)) GL_FUNC(glDebugMessageCallback, void, (GLDEBUGPROC callback, const void *userParam))