From 97dc6a4eeb486bc8b55a6281d349d877af647276 Mon Sep 17 00:00:00 2001 From: William Manning Date: Tue, 18 Jan 2022 00:24:25 -0500 Subject: [PATCH 1/5] Fix incorrect GLsizei alias --- src/glTypes.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/glTypes.jl b/src/glTypes.jl index c6cb63f..efb60f5 100644 --- a/src/glTypes.jl +++ b/src/glTypes.jl @@ -19,7 +19,7 @@ const GLhalf = Cushort const GLenum = Cuint const GLboolean = Cuchar const GLclampf = Cfloat -const GLsizei = Cssize_t +const GLsizei = Cint const GLsync = Ptr{Cvoid} const GLuint64 = Culonglong const GLclampd = Cdouble From 81ad971eea2e66b165422ac6efd108d0e6a18c33 Mon Sep 17 00:00:00 2001 From: heyx3 Date: Tue, 25 Jan 2022 01:03:39 -0500 Subject: [PATCH 2/5] Add buffer constants --- src/glConstants.jl | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/glConstants.jl b/src/glConstants.jl index e3e697e..b67dbc8 100644 --- a/src/glConstants.jl +++ b/src/glConstants.jl @@ -1722,6 +1722,13 @@ const GL_RESET_NOTIFICATION_STRATEGY = convert( const GL_LOSE_CONTEXT_ON_RESET = convert(GLenum, 0x8252) const GL_NO_RESET_NOTIFICATION = convert(GLenum, 0x8261) const GL_CONTEXT_LOST = convert(GLenum, 0x0507) +const GL_MAP_PERSISTENT_BIT = convert(GLbitfield, 0x0040) +const GL_MAP_COHERENT_BIT = convert(GLbitfield, 0x0080) +const GL_DYNAMIC_STORAGE_BIT = convert(GLbitfield, 0x0100) +const GL_CLIENT_STORAGE_BIT = convert(GLbitfield, 0x0200) +const GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT = convert(GLbitfield, 0x000004000) +const GL_BUFFER_IMMUTABLE_STORAGE = convert(GLenum, 0x821F) +const GL_BUFFER_STORAGE_FLAGS = convert(GLenum, 0x8220) end #Enum macro end export GL_MAP1_GRID_SEGMENTS @@ -3436,3 +3443,6 @@ export GL_GUILTY_CONTEXT_RESET, GL_INNOCENT_CONTEXT_RESET, GL_UNKNOWN_CONTEXT_RE GL_CONTEXT_ROBUST_ACCESS, GL_RESET_NOTIFICATION_STRATEGY, GL_LOSE_CONTEXT_ON_RESET, GL_NO_RESET_NOTIFICATION, GL_CONTEXT_LOST +export GL_MAP_PERSISTENT_BIT, GL_MAP_COHERENT_BIT, GL_DYNAMIC_STORAGE_BIT, + GL_CLIENT_STORAGE_BIT, GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT, + GL_BUFFER_IMMUTABLE_STORAGE, GL_BUFFER_STORAGE_FLAGS \ No newline at end of file From b55471504f2a1e14ee4c5d06c6982593231d3710 Mon Sep 17 00:00:00 2001 From: heyx3 Date: Tue, 25 Jan 2022 01:46:01 -0500 Subject: [PATCH 3/5] Add texture compression enums --- src/glConstants.jl | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/glConstants.jl b/src/glConstants.jl index 2598d90..e97f2bc 100644 --- a/src/glConstants.jl +++ b/src/glConstants.jl @@ -1730,6 +1730,7 @@ const GL_CLIENT_STORAGE_BIT = convert( const GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT = convert(GLbitfield, 0x000004000) const GL_BUFFER_IMMUTABLE_STORAGE = convert(GLenum, 0x821F) const GL_BUFFER_STORAGE_FLAGS = convert(GLenum, 0x8220) +<<<<<<< Updated upstream const GL_QUERY_BUFFER = convert(GLenum, 0x9192) const GL_LOCATION_COMPONENT = convert(GLenum, 0x934A) const GL_TRANSFORM_FEEDBACK_BUFFER_INDEX = convert(GLenum, 0x934B) @@ -1759,6 +1760,12 @@ const GL_TEXTURE_MAX_ANISOTROPY = convert( const GL_MAX_TEXTURE_MAX_ANISOTROPY = convert(GLenum, 0x84FF) const GL_POLYGON_OFFSET_CLAMP = convert(GLenum, 0x8E1B) const GL_CONTEXT_FLAG_NO_ERROR_BIT = convert(GLbitfield, 0x00000008) +======= +const GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT = convert(GLenum, 0x8E8E) +const GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT = convert(GLenum, 0x8E8F) +const GL_COMPRESSED_RGBA_BPTC_UNORM = convert(GLenum, 0x8E8C) +const GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM = convert(GLenum, 0x8E8D) +>>>>>>> Stashed changes end #Enum macro end export GL_MAP1_GRID_SEGMENTS @@ -3482,6 +3489,7 @@ export GL_GUILTY_CONTEXT_RESET, GL_INNOCENT_CONTEXT_RESET, GL_UNKNOWN_CONTEXT_RE export GL_MAP_PERSISTENT_BIT, GL_MAP_COHERENT_BIT, GL_DYNAMIC_STORAGE_BIT, GL_CLIENT_STORAGE_BIT, GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT, GL_BUFFER_IMMUTABLE_STORAGE, GL_BUFFER_STORAGE_FLAGS +<<<<<<< Updated upstream export GL_SPIR_V_BINARY, GL_SPIR_V_EXTENSIONS, GL_NUM_SPIR_V_EXTENSIONS export GL_VERTICES_SUBMITTED, GL_PRIMITIVES_SUBMITTED, GL_VERTEX_SHADER_INVOCATIONS, GL_TESS_CONTROL_SHADER_PATCHES, GL_TESS_EVALUATION_SHADER_INVOCATIONS, @@ -3491,3 +3499,7 @@ export GL_TRANSFORM_FEEDBACK_OVERFLOW, GL_TRANSFORM_FEEDBACK_STREAM_OVERFLOW export GL_TEXTURE_MAX_ANISOTROPY, GL_MAX_TEXTURE_MAX_ANISOTROPY export GL_POLYGON_OFFSET_CLAMP export GL_CONTEXT_FLAG_NO_ERROR_BIT +======= +export GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT, GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT, + GL_COMPRESSED_RGBA_BPTC_UNORM, GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM +>>>>>>> Stashed changes From e8954ccc90858ce3c46e6498d576096dd94e96db Mon Sep 17 00:00:00 2001 From: heyx3 Date: Tue, 25 Jan 2022 01:47:08 -0500 Subject: [PATCH 4/5] Fix git being dumb --- src/glConstants.jl | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/glConstants.jl b/src/glConstants.jl index e97f2bc..3425321 100644 --- a/src/glConstants.jl +++ b/src/glConstants.jl @@ -1730,7 +1730,6 @@ const GL_CLIENT_STORAGE_BIT = convert( const GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT = convert(GLbitfield, 0x000004000) const GL_BUFFER_IMMUTABLE_STORAGE = convert(GLenum, 0x821F) const GL_BUFFER_STORAGE_FLAGS = convert(GLenum, 0x8220) -<<<<<<< Updated upstream const GL_QUERY_BUFFER = convert(GLenum, 0x9192) const GL_LOCATION_COMPONENT = convert(GLenum, 0x934A) const GL_TRANSFORM_FEEDBACK_BUFFER_INDEX = convert(GLenum, 0x934B) @@ -1760,12 +1759,10 @@ const GL_TEXTURE_MAX_ANISOTROPY = convert( const GL_MAX_TEXTURE_MAX_ANISOTROPY = convert(GLenum, 0x84FF) const GL_POLYGON_OFFSET_CLAMP = convert(GLenum, 0x8E1B) const GL_CONTEXT_FLAG_NO_ERROR_BIT = convert(GLbitfield, 0x00000008) -======= const GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT = convert(GLenum, 0x8E8E) const GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT = convert(GLenum, 0x8E8F) const GL_COMPRESSED_RGBA_BPTC_UNORM = convert(GLenum, 0x8E8C) const GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM = convert(GLenum, 0x8E8D) ->>>>>>> Stashed changes end #Enum macro end export GL_MAP1_GRID_SEGMENTS @@ -3489,7 +3486,6 @@ export GL_GUILTY_CONTEXT_RESET, GL_INNOCENT_CONTEXT_RESET, GL_UNKNOWN_CONTEXT_RE export GL_MAP_PERSISTENT_BIT, GL_MAP_COHERENT_BIT, GL_DYNAMIC_STORAGE_BIT, GL_CLIENT_STORAGE_BIT, GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT, GL_BUFFER_IMMUTABLE_STORAGE, GL_BUFFER_STORAGE_FLAGS -<<<<<<< Updated upstream export GL_SPIR_V_BINARY, GL_SPIR_V_EXTENSIONS, GL_NUM_SPIR_V_EXTENSIONS export GL_VERTICES_SUBMITTED, GL_PRIMITIVES_SUBMITTED, GL_VERTEX_SHADER_INVOCATIONS, GL_TESS_CONTROL_SHADER_PATCHES, GL_TESS_EVALUATION_SHADER_INVOCATIONS, @@ -3499,7 +3495,5 @@ export GL_TRANSFORM_FEEDBACK_OVERFLOW, GL_TRANSFORM_FEEDBACK_STREAM_OVERFLOW export GL_TEXTURE_MAX_ANISOTROPY, GL_MAX_TEXTURE_MAX_ANISOTROPY export GL_POLYGON_OFFSET_CLAMP export GL_CONTEXT_FLAG_NO_ERROR_BIT -======= export GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT, GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT, GL_COMPRESSED_RGBA_BPTC_UNORM, GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM ->>>>>>> Stashed changes From 03b459cbf17e1bd2c48e825f4cb1a4da37e16d52 Mon Sep 17 00:00:00 2001 From: heyx3 Date: Tue, 25 Jan 2022 01:47:42 -0500 Subject: [PATCH 5/5] Update readme to be more specific about OpenGL versions --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c6c388c..a817222 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Build Status](https://github.com/JuliaGL/ModernGL.jl/workflows/CI/badge.svg?branch=master)](https://github.com/JuliaGL/ModernGL.jl/actions) -OpenGL bindings for OpenGL 3.0 and upwards. As OpenGL 3.0 has a lot of overlaps with OpenGL 2.1, OpenGL 2.1 is partly supported as well. +OpenGL bindings for OpenGL 3.0 through 4.6. As OpenGL 3.0 has a lot of overlaps with OpenGL 2.1, OpenGL 2.1 is partly supported as well. The philosophy is to keep this library strictly a low-level wrapper, so you won't find any error handling (besides for the function loading itself) or abstractions in this package.