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

[3.x] Initialize GLWrapper earlier in Storage::initialize() #80843

Merged
merged 1 commit into from
Aug 21, 2023

Conversation

lawnjelly
Copy link
Member

@lawnjelly lawnjelly commented Aug 21, 2023

Make sure GLWrapper is initialized before glActiveTexture is called by other parts of the storage initialize(), to prevent benign warnings.

Fixes issue mentioned in #80481 by @harrisyu .

Notes

  • This was a search/replace all bug, I didn't realise that glActiveTexture was called before the wrapper was initialized, in the storage initialize. Must have only tested on GLES2.
  • Have shifted it back in GLES2 as well as GLES3, to prevent any future recurrence.
  • The warnings when starting up GLES3 won't have caused any problems, so they should just be ignored by users until next beta.
  • Looking at the merge date I think this was merged just after beta 3, so should only affect users on 3.x dev.

Make sure `GLWrapper` is initialized before `glActiveTexture` is called by other parts of the storage initialize(), to prevent benign warnings.
@lawnjelly lawnjelly added this to the 3.6 milestone Aug 21, 2023
@lawnjelly lawnjelly requested a review from a team as a code owner August 21, 2023 07:57
@lawnjelly lawnjelly changed the title Initialize GLWrapper earlier in Storage::initialize() [3.x] Initialize GLWrapper earlier in Storage::initialize() Aug 21, 2023
@akien-mga akien-mga merged commit 17b403a into godotengine:3.x Aug 21, 2023
13 checks passed
@akien-mga
Copy link
Member

Thanks!

@harrisyu
Copy link
Contributor

Thank you !

@lawnjelly lawnjelly deleted the fix_gles3_wrapper_init branch August 21, 2023 09:58
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.

4 participants