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

[Graphics] Fix expected image size for OpenGL textures. #1786

Merged
merged 1 commit into from
Sep 17, 2023

Conversation

Basewq
Copy link
Contributor

@Basewq Basewq commented Sep 17, 2023

PR Details

Fixes "Image size different than expected." in the Asset Compiler when compiling for Android with graphics level 10+.

Description

Gets the correct 'bpb' value for certain ETC2 pixel formats.

Related Issue

Solves the first part of #1600 however my machine isn't set up correctly to fix the other ETC2 issues.

Motivation and Context

Types of changes

  • Docs change / refactoring / dependency upgrade
  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist

  • My change requires a change to the documentation.
  • I have added tests to cover my changes.
  • All new and existing tests passed.

@Eideren
Copy link
Collaborator

Eideren commented Sep 17, 2023

Thanks a bunch @Basewq !
There are a couple of extraneous white spaces included with your commit, not a big deal at all, but try to avoid including them if you can :)

Seems fairly straightforward, I'll merge this in.

@Eideren Eideren merged commit 79344b8 into stride3d:master Sep 17, 2023
@Basewq Basewq deleted the img_size_fix branch September 17, 2023 22:30
@Basewq
Copy link
Contributor Author

Basewq commented Sep 17, 2023

Thanks a bunch @Basewq ! There are a couple of extraneous white spaces included with your commit, not a big deal at all, but try to avoid including them if you can :)

Seems fairly straightforward, I'll merge this in.

Thanks, strangely enough I don't see those extraneous whitespaces changes in git on my machine (or in the commits itself on my machine). It seems github might be doing some extra work?

@Eideren
Copy link
Collaborator

Eideren commented Sep 17, 2023

Couldn't tell you why that is, perhaps your git diff or the tool you use to see diffs doesn't display whitespace changes.
It's fine if you can't figure it out, we'll merge those if they are benign and remove them through github's text editor if not.

@Basewq
Copy link
Contributor Author

Basewq commented Sep 17, 2023

Couldn't tell you why that is, perhaps your git diff or the tool you use to see diffs doesn't display whitespace changes. It's fine if you can't figure it out, we'll merge those if they are benign and remove them through github's text editor if not.

Oops, you're right, at some point I accidentally clicked a setting to hide whitespace only changes and didn't notice. Thanks for pointing it out!

@Eideren
Copy link
Collaborator

Eideren commented Sep 17, 2023

Nice, glad we could figure this one out !

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

Successfully merging this pull request may close these issues.

2 participants