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 OpenGL error when generating radiance #40558

Merged
merged 1 commit into from
Jul 21, 2020

Conversation

clayjohn
Copy link
Member

Fixes: #40444

Looks like my hardware just silently ignored the fact that the texture was the wrong type.

Seems to work fine for me. But I was unable to reproduce the linked error.

@clayjohn clayjohn added this to the 3.2 milestone Jul 21, 2020
@clayjohn clayjohn requested a review from reduz as a code owner July 21, 2020 03:09
@akien-mga
Copy link
Member

There seems to be a second occurrence of glFramebufferTextureLayer in that file (and those are the only ones in the codebase, apart from glad code that defines it) that probably needs a similar treatment:

drivers/gles3/rasterizer_storage_gles3.cpp
2043:                   glFramebufferTextureLayer(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, sky->radiance, 0, j);
2172:                   glFramebufferTextureLayer(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, sky->radiance, 0, lod);

@clayjohn
Copy link
Member Author

There seems to be a second occurrence of glFramebufferTextureLayer in that file (and those are the only ones in the codebase, apart from glad code that defines it) that probably needs a similar treatment:

The other occurence is correct. It is used when we are using a texture array for radiance. This issue resulted from copy-pasting that code.

@clayjohn clayjohn force-pushed the GLES3-sky-texture branch from e09bf21 to 2534e28 Compare July 21, 2020 17:41
@clayjohn
Copy link
Member Author

@akien-mga Should be good to merge once CI passes.

@akien-mga akien-mga merged commit af35d0d into godotengine:3.2 Jul 21, 2020
@akien-mga
Copy link
Member

Thanks!

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.

2 participants