Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix fragment shader bindless handle assertion in glfw-gl4 backend #579

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix fragment shader bindless handle assertion in glfw-gl4 backend #579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
495e38d
changed chader uniform from uint64 to uvec2
JoseAFRibeiro Oct 11, 2023
b0b1477
added changes to changelog and clib.json
JoseAFRibeiro Oct 11, 2023
f8828ea
fixed date in changelog
JoseAFRibeiro Oct 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion clib.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nuklear",
"version": "4.10.6",
"version": "4.10.7",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Since this is part of the demos, likely don't need to bump the version number 👍

Suggested change
"version": "4.10.7",
"version": "4.10.6",

"repo": "Immediate-Mode-UI/Nuklear",
"description": "A small ANSI C gui toolkit",
"keywords": ["gl", "ui", "toolkit"],
Expand Down
4 changes: 2 additions & 2 deletions demo/glfw_opengl4/nuklear_glfw_gl4.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ nk_glfw3_device_create()
NK_SHADER_BINDLESS
NK_SHADER_64BIT
"precision mediump float;\n"
"uniform uint64_t Texture;\n"
"uniform uvec2 Texture;\n"
"in vec2 Frag_UV;\n"
"in vec4 Frag_Color;\n"
"out vec4 Out_Color;\n"
Expand Down Expand Up @@ -436,7 +436,7 @@ nk_glfw3_render(enum nk_anti_aliasing AA)
if (!glIsTextureHandleResidentARB(tex_handle))
glMakeTextureHandleResidentARB(tex_handle);

glUniformHandleui64ARB(dev->uniform_tex, tex_handle);
glUniform2ui(dev->uniform_tex, tex_handle, tex_handle >> 32);
glScissor(
(GLint)(cmd->clip_rect.x * glfw.fb_scale.x),
(GLint)((glfw.height - (GLint)(cmd->clip_rect.y + cmd->clip_rect.h)) * glfw.fb_scale.y),
Expand Down
1 change: 1 addition & 0 deletions src/CHANGELOG
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
/// - [y]: Minor version with non-breaking API and library changes
/// - [z]: Patch version with no direct changes to the API
///
/// - 2023/10/11 (4.10.7) - Fix glfw-gl4 assertion faillure
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
/// - 2023/10/11 (4.10.7) - Fix glfw-gl4 assertion faillure

/// - 2022/12/23 (4.10.6) - Fix incorrect glyph index in nk_font_bake()
/// - 2022/12/17 (4.10.5) - Fix nk_font_bake_pack() using TTC font offset incorrectly
/// - 2022/10/24 (4.10.4) - Fix nk_str_{append,insert}_str_utf8 always returning 0
Expand Down