OpenGL: Implement 3D Texture support by alula · Pull Request #80363 · godotengine/godot

alula · 2023-08-07T08:42:48Z

Bugsquad edit:

Fixes OpenGL: TextureArrays and Texture3D samplers not implemented yet #71029

akien-mga · 2023-08-07T09:36:40Z

Should fix #71029 I suppose?

alula · 2023-08-07T09:43:13Z

This is for 4.x compatibility renderer, so 3.x milestone sounds like a mistake...

clayjohn · 2023-08-07T15:15:57Z

I am getting the following error just opening up the project manager with this PR:

ERROR: Image has included mipmaps
   at: texture_3d_initialize (drivers/gles3/storage/texture_storage.cpp:816)
ERROR: Image has included mipmaps
   at: texture_3d_initialize (drivers/gles3/storage/texture_storage.cpp:816)

I traced it back to our default texture generation which reuses images that already have mipmaps to create the default images. The following diff resolves the errors:

diff --git a/drivers/gles3/storage/texture_storage.cpp b/drivers/gles3/storage/texture_storage.cpp
index 268043f99f..ef16a52b3a 100644
--- a/drivers/gles3/storage/texture_storage.cpp
+++ b/drivers/gles3/storage/texture_storage.cpp
@@ -77,19 +77,24 @@ TextureStorage::TextureStorage() {
 			default_gl_textures[DEFAULT_GL_TEXTURE_2D_ARRAY_WHITE] = texture_allocate();
 			texture_2d_layered_initialize(default_gl_textures[DEFAULT_GL_TEXTURE_2D_ARRAY_WHITE], images, RS::TEXTURE_LAYERED_2D_ARRAY);
 
-			for (int i = 0; i < 3; i++) {
+			for (int i = 0; i < 5; i++) {
 				images.push_back(image);
 			}
 
-			default_gl_textures[DEFAULT_GL_TEXTURE_3D_WHITE] = texture_allocate();
-			texture_3d_initialize(default_gl_textures[DEFAULT_GL_TEXTURE_3D_WHITE], image->get_format(), 4, 4, 4, false, images);
+			default_gl_textures[DEFAULT_GL_TEXTURE_CUBEMAP_WHITE] = texture_allocate();
+			texture_2d_layered_initialize(default_gl_textures[DEFAULT_GL_TEXTURE_CUBEMAP_WHITE], images, RS::TEXTURE_LAYERED_CUBEMAP);
+		}
+
+		{
+			Ref<Image> image = Image::create_empty(4, 4, false, Image::FORMAT_RGBA8);
+			image->fill(Color(1, 1, 1, 1));
 
-			for (int i = 0; i < 2; i++) {
+			Vector<Ref<Image>> images;
+			for (int i = 0; i < 4; i++) {
 				images.push_back(image);
 			}
-
-			default_gl_textures[DEFAULT_GL_TEXTURE_CUBEMAP_WHITE] = texture_allocate();
-			texture_2d_layered_initialize(default_gl_textures[DEFAULT_GL_TEXTURE_CUBEMAP_WHITE], images, RS::TEXTURE_LAYERED_CUBEMAP);
+			default_gl_textures[DEFAULT_GL_TEXTURE_3D_WHITE] = texture_allocate();
+			texture_3d_initialize(default_gl_textures[DEFAULT_GL_TEXTURE_3D_WHITE], image->get_format(), 4, 4, 4, false, images);
 		}
 
 		{ // black
@@ -101,19 +106,23 @@ TextureStorage::TextureStorage() {
 			texture_2d_initialize(default_gl_textures[DEFAULT_GL_TEXTURE_BLACK], image);
 
 			Vector<Ref<Image>> images;
-
-			for (int i = 0; i < 4; i++) {
+			for (int i = 0; i < 6; i++) {
 				images.push_back(image);
 			}
+			default_gl_textures[DEFAULT_GL_TEXTURE_CUBEMAP_BLACK] = texture_allocate();
+			texture_2d_layered_initialize(default_gl_textures[DEFAULT_GL_TEXTURE_CUBEMAP_BLACK], images, RS::TEXTURE_LAYERED_CUBEMAP);
+		}
 
-			default_gl_textures[DEFAULT_GL_TEXTURE_3D_BLACK] = texture_allocate();
-			texture_3d_initialize(default_gl_textures[DEFAULT_GL_TEXTURE_3D_BLACK], image->get_format(), 4, 4, 4, false, images);
+		{
+			Ref<Image> image = Image::create_empty(4, 4, false, Image::FORMAT_RGBA8);
+			image->fill(Color(0, 0, 0, 1));
 
-			for (int i = 0; i < 2; i++) {
+			Vector<Ref<Image>> images;
+			for (int i = 0; i < 4; i++) {
 				images.push_back(image);
 			}
-			default_gl_textures[DEFAULT_GL_TEXTURE_CUBEMAP_BLACK] = texture_allocate();
-			texture_2d_layered_initialize(default_gl_textures[DEFAULT_GL_TEXTURE_CUBEMAP_BLACK], images, RS::TEXTURE_LAYERED_CUBEMAP);
+			default_gl_textures[DEFAULT_GL_TEXTURE_3D_BLACK] = texture_allocate();
+			texture_3d_initialize(default_gl_textures[DEFAULT_GL_TEXTURE_3D_BLACK], image->get_format(), 4, 4, 4, false, images);
 		}
 
 		{ // transparent black
@@ -813,6 +822,7 @@ void TextureStorage::texture_3d_initialize(RID p_texture, Image::Format p_format

alula · 2023-08-07T21:55:45Z

done

clayjohn

This looks mostly good. I left a comment on the validation code as it will need some changes.

Another thing to consider is implementing texture_3d_get() without it, NoiseTexture3Ds crash on creation. Please let me know if you would like some help with implementing texture_3d_get() as it is a little more complex

alula · 2023-09-08T05:16:32Z

NoiseTexture3Ds seem to work fine now and implementing texture_2d_layer_get() and texture_3d_get() is straightforward on OpenGL due to glGetTexImage() availability but a bit tricky on GLES.

For me it looks like it would need a variant of the copy.glsl shader with sampler3D, what would be your preferred way to implement that?

clayjohn · 2023-09-08T15:22:39Z

I would do something similar to how it was done in 3.x

godot/drivers/gles3/rasterizer_storage_gles3.cpp

Line 1039 in 4461f38

    
           if (texture->type == VS::TEXTURE_TYPE_2D_ARRAY || texture->type == VS::TEXTURE_TYPE_3D) {

alula · 2023-09-19T02:12:07Z

That should be everything I guess?

alula

I've applied the code review changes in separate commit, but it's not showing up here for me for some reason?

alula · 2023-09-19T13:19:33Z

GitHub moment

alula · 2023-10-01T11:27:37Z

rebased

alula · 2023-10-19T02:18:18Z

Fixed an issue I found while testing my project on Web target, any updates on this PR by the way?

QbieShay · 2023-12-06T17:52:52Z

Hey 👋

This has been postponed to 4.3 at the time of 4.2, are you still available to update this PR @alula ?

Please let us know so we can organise and align on the implementation ^^

alula · 2023-12-06T17:54:13Z

Oh yes, I'm still around, I'll update it soon!

clayjohn · 2024-01-16T23:19:28Z

Hi! This has become a blocker for other work that needs to get finished on the compatibility backend. So I'm going to make the necessary changes and push directly to this PR

alula · 2024-01-18T08:48:41Z

@clayjohn alright, I've been busy with irl stuff and went on trip after my last comment and totally forgot about finishing this PR, oops... 😅

clayjohn · 2024-01-19T01:50:05Z

@clayjohn alright, I've been busy with irl stuff and went on trip after my last comment and totally forgot about finishing this PR, oops... 😅

No worries!

alula · 2024-02-02T00:57:37Z

rebased

clayjohn

Hey, thanks for rebasing and updating based on my last comment.

Right after commenting earlier I realized we could get by a little longer without 3D textures. So thank you for taking the initiative back and finishing this PR.

It looks great to me overall. The final step before merging it is to "squash" all the commits into one commit. We describe how to that here: https://docs.godotengine.org/en/latest/contributing/workflow/pr_workflow.html#the-interactive-rebase

We like to have only one commit per PR in order to keep our git history clean and easy to navigate. Please let me know if you run into any trouble or want me to finish it off for you. I feel bad saying I would take over and then leaving it to you to finish again.

alula · 2024-02-05T19:11:41Z

done

Hey, thanks for rebasing and updating based on my last comment.

Right after commenting earlier I realized we could get by a little longer without 3D textures. So thank you for taking the initiative back and finishing this PR.

It looks great to me overall. The final step before merging it is to "squash" all the commits into one commit. We describe how to that here: https://docs.godotengine.org/en/latest/contributing/workflow/pr_workflow.html#the-interactive-rebase

We like to have only one commit per PR in order to keep our git history clean and easy to navigate. Please let me know if you run into any trouble or want me to finish it off for you. I feel bad saying I would take over and then leaving it to you to finish again.

akien-mga · 2024-02-07T10:15:42Z

Thanks!

alula requested a review from a team as a code owner August 7, 2023 08:42

akien-mga added bug enhancement topic:rendering topic:3d labels Aug 7, 2023

akien-mga added this to the 3.x milestone Aug 7, 2023

akien-mga modified the milestones: 3.x, 4.2 Aug 7, 2023

clayjohn reviewed Aug 8, 2023

View reviewed changes

Comment thread drivers/gles3/storage/texture_storage.cpp Outdated

alula force-pushed the gl3-texture3d branch 2 times, most recently from b3942da to bfd8ca8 Compare September 8, 2023 04:49

AThousandShips reviewed Sep 11, 2023

View reviewed changes

alula force-pushed the gl3-texture3d branch 3 times, most recently from ad3492d to 34c1030 Compare September 19, 2023 02:10

AThousandShips reviewed Sep 19, 2023

View reviewed changes

alula commented Sep 19, 2023

View reviewed changes

alula force-pushed the gl3-texture3d branch from bb2aa59 to c8d8255 Compare September 19, 2023 13:24

alula requested a review from clayjohn September 22, 2023 08:28

AThousandShips reviewed Sep 22, 2023

View reviewed changes

Comment thread drivers/gles3/storage/texture_storage.cpp Outdated

Comment thread drivers/gles3/storage/texture_storage.cpp Outdated

Comment thread drivers/gles3/storage/texture_storage.cpp Outdated

alula force-pushed the gl3-texture3d branch 2 times, most recently from d85a0f3 to 5badccf Compare September 27, 2023 14:22

alula force-pushed the gl3-texture3d branch from 5badccf to f7a0be3 Compare October 1, 2023 11:27

Calinou mentioned this pull request Oct 12, 2023

Godot crashes when creating a NoiseTexture3D in compatibility renderer #83174

Closed

clayjohn reviewed Oct 19, 2023

View reviewed changes

Comment thread drivers/gles3/storage/texture_storage.cpp Outdated

TokisanGames mentioned this pull request Oct 20, 2023

Support Compatibility Renderer TokisanGames/Terrain3D#217

Closed

clayjohn modified the milestones: 4.2, 4.3 Oct 25, 2023

alula force-pushed the gl3-texture3d branch from ca886e6 to 0c0f6cc Compare January 18, 2024 09:39

alula force-pushed the gl3-texture3d branch from b68d30a to 121d76d Compare February 2, 2024 00:57

clayjohn approved these changes Feb 5, 2024

View reviewed changes

Comment thread drivers/gles3/storage/texture_storage.cpp Outdated

clayjohn added the cherrypick:4.2 Considered for cherry-picking into a future 4.2.x release label Feb 5, 2024

AThousandShips approved these changes Feb 5, 2024

View reviewed changes

Comment thread drivers/gles3/storage/texture_storage.cpp Outdated

Comment thread drivers/gles3/storage/texture_storage.cpp Outdated

Comment thread drivers/gles3/storage/texture_storage.cpp Outdated

Comment thread drivers/gles3/storage/texture_storage.cpp Outdated

OpenGL: Implement 3D Texture support

ea229f5

alula force-pushed the gl3-texture3d branch from 121d76d to ea229f5 Compare February 5, 2024 19:11

akien-mga merged commit 40eb988 into godotengine:master Feb 7, 2024

clayjohn removed the cherrypick:4.2 Considered for cherry-picking into a future 4.2.x release label Mar 11, 2024

AThousandShips mentioned this pull request Aug 11, 2024

FastNoiseLite for NoiseTexture3D always returns zero #95382

Closed

Uh oh!

Conversation

alula commented Aug 7, 2023 • edited by akien-mga Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

akien-mga commented Aug 7, 2023

Uh oh!

alula commented Aug 7, 2023

Uh oh!

clayjohn commented Aug 7, 2023

Uh oh!

alula commented Aug 7, 2023

Uh oh!

clayjohn left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

alula commented Sep 8, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

clayjohn commented Sep 8, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

alula commented Sep 19, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

alula left a comment

Choose a reason for hiding this comment

Uh oh!

alula commented Sep 19, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

alula commented Oct 1, 2023

Uh oh!

alula commented Oct 19, 2023

Uh oh!

Uh oh!

QbieShay commented Dec 6, 2023

Uh oh!

alula commented Dec 6, 2023

Uh oh!

clayjohn commented Jan 16, 2024

Uh oh!

alula commented Jan 18, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

clayjohn commented Jan 19, 2024

Uh oh!

alula commented Feb 2, 2024

Uh oh!

clayjohn left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

alula commented Feb 5, 2024

Uh oh!

akien-mga commented Feb 7, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

alula commented Aug 7, 2023 •

edited by akien-mga

Loading

alula commented Sep 8, 2023 •

edited

Loading

alula commented Jan 18, 2024 •

edited

Loading