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.

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 a bug in duplicate location checking #2019

Merged
merged 3 commits into from Jul 30, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion CHANGELOG.md
@@ -1,8 +1,13 @@
# Changelog

## Version 0.32 (2022-07-30)
## Version 0.32.1 (2022-07-31)

- Bugfix release to not panic when given multiple vertex attributes with unspecified location numbers.

## Version 0.32.0 (2022-07-30)

- Updated glutin to version 0.29.0. See the glutin release notes [here](https://github.com/rust-windowing/glutin/blob/master/CHANGELOG.md#version-0290-2022-07-30).
- Support for location binding for Vertex attributes.

## Version 0.31 (2021-12-11)

Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "glium"
version = "0.32.0"
version = "0.32.1"
authors = ["Pierre Krieger <pierre.krieger1708@gmail.com>"]
description = """
Elegant and safe OpenGL wrapper.
Expand Down
2 changes: 1 addition & 1 deletion src/vertex_array_object.rs
Expand Up @@ -290,7 +290,7 @@ impl VertexArrayObject {
for &(_, ref bindings, _, _, _) in vertex_buffers {
for (i, bi) in bindings.iter().enumerate() {
for (o, bo) in bindings.iter().enumerate() {
if i != o && bi.2 == bo.2 {
if i != o && bi.2 == bo.2 && bi.2 != -1 {
panic!("The program attribute `{}` has the same binding location as program attribute `{}` (binding location {})",
bi.0, bo.0, bi.2)
}
Expand Down