Details

Reviewers

Commits

rBbdda53fdb29d: GPU: Texture: Replace internal sampler state by explicit state object

Summary

This makes it easier to track as well as allowing us to sample the same texture with different sampling parameters (which should fix the related T73942 in the long run).
This also makes us more aligned with vulkan spec, because the sampler state is not part of the texture.

This patch only modifies the GPU module implementation. The draw manager still expect one GPUTexture per sampler unit so that will have to be refactored in another patch.

Minor good side effect, changing anisotropic filtering does not free all textures anymore.

Diff Detail

Repository: rB Blender

Event Timeline

Clément Foucault (fclem) requested review of this revision.May 25 2020, 11:32 AM

Clément Foucault (fclem) created this revision.

Harbormaster completed remote builds in B8180: Diff 25048.May 25 2020, 11:32 AM

Fix GL_TEXTURE_MAX_ANISOTROPY_EXT not being optional

Harbormaster completed remote builds in B8181: Diff 25050.May 25 2020, 11:43 AM

Remove uneeded binds

Harbormaster completed remote builds in B8187: Diff 25056.May 25 2020, 12:08 PM

Fix crash / assert

Harbormaster completed remote builds in B8189: Diff 25058.May 25 2020, 12:10 PM

Brecht Van Lommel (brecht) requested changes to this revision.May 27 2020, 7:23 PM

Brecht Van Lommel (brecht) added inline comments.

source/blender/gpu/intern/gpu_texture.c
1774	Assert and print an error when no free texture unit is found?
1777–1788	This early return could be replaced by `else { break; }` inside the loop below.

This revision now requires changes to proceed.May 27 2020, 7:23 PM

Address reviewer comments
Merge branch 'master' into tmp-texture-sampler

Harbormaster completed remote builds in B8290: Diff 25242.May 29 2020, 4:41 PM

Brecht Van Lommel (brecht) accepted this revision.Jun 2 2020, 7:18 AM

This revision is now accepted and ready to land.Jun 2 2020, 7:18 AM

Closed by commit rBbdda53fdb29d: GPU: Texture: Replace internal sampler state by explicit state object (authored by Clément Foucault (fclem)). · Explain WhyJun 2 2020, 10:48 AM

This revision was automatically updated to reflect the committed changes.

Clément Foucault (fclem) added a commit: rBbdda53fdb29d: GPU: Texture: Replace internal sampler state by explicit state object.

GPU: Texture: Replace internal sampler state by explicit state object
ClosedPublic
Actions

Details

Diff Detail

Event Timeline

Revision Contents
Changeset List

Diff 25380

source/blender/blenkernel/intern/studiolight.c

source/blender/draw/engines/eevee/eevee_lightcache.c

source/blender/draw/engines/eevee/eevee_subsurface.c

source/blender/draw/engines/eevee/eevee_volumes.c

source/blender/draw/engines/workbench/workbench_effect_antialiasing.c

source/blender/draw/intern/draw_manager_texture.c

source/blender/gpu/GPU_texture.h

source/blender/gpu/intern/gpu_draw.c

source/blender/gpu/intern/gpu_extensions.c

source/blender/gpu/intern/gpu_texture.c

GPU: Texture: Replace internal sampler state by explicit state objectClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 25380

source/blender/blenkernel/intern/studiolight.c

source/blender/draw/engines/eevee/eevee_lightcache.c

source/blender/draw/engines/eevee/eevee_subsurface.c

source/blender/draw/engines/eevee/eevee_volumes.c

source/blender/draw/engines/workbench/workbench_effect_antialiasing.c

source/blender/draw/intern/draw_manager_texture.c

source/blender/gpu/GPU_texture.h

source/blender/gpu/intern/gpu_draw.c

source/blender/gpu/intern/gpu_extensions.c

source/blender/gpu/intern/gpu_texture.c

GPU: Texture: Replace internal sampler state by explicit state object
ClosedPublic
Actions

Revision Contents
Changeset List