Page MenuHome
Differential D16303

GPU: Avoid undocumented/fragile dependency on shader enumerator order
ClosedPublic
Actions

Authored by Julian Eisel (Severin) on Oct 20 2022, 12:57 PM.

Details

Reviewers
Clément Foucault (fclem)
Commits
rBc81bc09876f8: GPU: Avoid undocumented/fragile dependency on shader enumerator order
Summary

Previously this was using GPU_SHADER_TEXT as default value indicating
an "unset" state. This wasn't documented in the definition (and so
D16284 added a new enumerator that broke this). Plus code was assuming
this enumerator would always have the value 0 without specifying this in
the definition either.

In this case it's easy to not rely on the enum value at all, and just
use std::optional to add a "unset" state.

Diff Detail

Repository
rB Blender

Event Timeline

Julian Eisel (Severin) requested review of this revision.Oct 20 2022, 12:57 PM
Julian Eisel (Severin) created this revision.
Harbormaster completed remote builds in B24351: Diff 56987.Oct 20 2022, 12:57 PM
Julian Eisel (Severin) added a project: EEVEE & Viewport.EditedOct 20 2022, 12:58 PM

Context: When D16284 added a new enumerator before GPU_SHADER_TEXT, the splash looked like this, and there were numerous other artifacts:


Same when explicitly setting GPU_SHADER_TEXT = 1 in the definition (because the implementation implicitly assumed it to be 0).

Clément Foucault (fclem) accepted this revision.Oct 20 2022, 1:04 PM
This revision is now accepted and ready to land.Oct 20 2022, 1:04 PM
Closed by commit rBc81bc09876f8: GPU: Avoid undocumented/fragile dependency on shader enumerator order (authored by Julian Eisel (Severin)). · Explain WhyOct 20 2022, 1:18 PM
This revision was automatically updated to reflect the committed changes.
Julian Eisel (Severin) added a commit: rBc81bc09876f8: GPU: Avoid undocumented/fragile dependency on shader enumerator order.

Revision Contents
Changeset List

PathSize
source/
blender/
gpu/
intern/
11 lines
8 lines

Diff 56989

View Options

source/blender/gpu/intern/gpu_immediate.cc

Loading...
View Options

source/blender/gpu/intern/gpu_immediate_private.hh

Loading...