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 int to uint implicit cast error when use mat3 uniform in compatibility renderer #81494

Conversation

jsjtxietian
Copy link
Contributor

@jsjtxietian jsjtxietian commented Sep 9, 2023

This should fix #81473

In _get_global_shader_uniform_from_type_and_index, we should use unit to do the math when the uniform is an index to the global table.
But this commit might have other implications, feel free to correct me !

@jsjtxietian jsjtxietian requested a review from a team as a code owner September 9, 2023 16:52
@AThousandShips AThousandShips added this to the 4.2 milestone Sep 9, 2023
@jsjtxietian jsjtxietian force-pushed the Fix-int-to-uint-implicit-cast-error-when-use-uniform-mat3-in-gles3 branch from 62b8a86 to 1d4e5a7 Compare September 9, 2023 16:59
@jsjtxietian jsjtxietian force-pushed the Fix-int-to-uint-implicit-cast-error-when-use-uniform-mat3-in-gles3 branch from 1d4e5a7 to 9376a13 Compare September 10, 2023 15:17
@jsjtxietian jsjtxietian force-pushed the Fix-int-to-uint-implicit-cast-error-when-use-uniform-mat3-in-gles3 branch from 9376a13 to 967e0e6 Compare October 27, 2023 03:02
Copy link
Member

@akien-mga akien-mga left a comment

Choose a reason for hiding this comment

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

Looks good to me.

@akien-mga akien-mga requested a review from clayjohn October 31, 2023 12:50
@clayjohn clayjohn added the cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release label Oct 31, 2023
@akien-mga akien-mga merged commit 2bc3530 into godotengine:master Oct 31, 2023
15 checks passed
@akien-mga
Copy link
Member

Thanks!

@jsjtxietian jsjtxietian deleted the Fix-int-to-uint-implicit-cast-error-when-use-uniform-mat3-in-gles3 branch November 1, 2023 02:02
@YuriSizov YuriSizov removed the cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release label Jan 23, 2024
@YuriSizov
Copy link
Contributor

Cherry-picked for 4.1.4.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Shaders fail to compile with matrix-type global uniforms (4.1 Compatibility renderer)
5 participants