Page MenuHome
Differential D4143

Fix T59773: Throw an error message if the gpu module is used in backgound mode.
ClosedPublic
Actions

Authored by Germano Cavalcante (mano-wii) on Dec 30 2018, 12:21 AM.

Details

Reviewers
Brecht Van Lommel (brecht)
Campbell Barton (campbellbarton)
Jacques Lucke (JacquesLucke)
Bastien Montagne (mont29)
Commits
rBS945007b32e9a: Fix T59773: Raise exception if the gpu module is used in backgound mode.
rB945007b32e9a: Fix T59773: Raise exception if the gpu module is used in backgound mode.
Summary

Instead of crashing, an error message is displayed if a function of the gpu module is called without a GPU context.

Diff Detail

Repository
rB Blender
Branch
blender2.8_fix_T59773 (branched from blender2.8)
Build Status
Buildable 2688
Build 2688: arc lint + arc unit

Event Timeline

Germano Cavalcante (mano-wii) created this revision.Dec 30 2018, 12:21 AM
Harbormaster completed remote builds in B2686: Diff 13069.Dec 30 2018, 12:21 AM
Germano Cavalcante (mano-wii) updated this revision to Diff 13077.Dec 30 2018, 11:10 PM
  • Cleanup: limit lines to a maximum of 80 characters.
Harbormaster completed remote builds in B2688: Diff 13077.Dec 30 2018, 11:10 PM
Brecht Van Lommel (brecht) requested changes to this revision.Dec 31 2018, 1:35 PM
Brecht Van Lommel (brecht) added inline comments.
source/blender/python/gpu/gpu_py.c
56

This is too vague. Could be something more specific like:

GPU functions for drawing are not available in background mode.
63

This seems to permanently disable the GPU module when Python tries to import it. But it can be initialized later on still, so this seems wrong.

Maybe it is better to disallow important the module at the top level. @Bastien Montagne (mont29) say in the task it wasn't necessary, but to me that seems like the cleaner solution?

This revision now requires changes to proceed.Dec 31 2018, 1:35 PM
Germano Cavalcante (mano-wii) marked an inline comment as done.Dec 31 2018, 5:54 PM
Germano Cavalcante (mano-wii) added inline comments.
source/blender/python/gpu/gpu_py.c
63

I agree, I didn't think of this. With a small change in the C code the python files can be initialized before the GPU.
Another solution would be to check if the GPU is initialized before calling each function. I tried to avoid this because some drawing functions can be called too often and it would be good to avoid overhead.
But the overhead is small. editing...

Germano Cavalcante (mano-wii) updated this revision to Diff 13080.Dec 31 2018, 6:36 PM
  • Check if gpu is initialized before calls instead of when initializing module.

    I have added check only on functions that initialize types and on the one that gets builtin shaders. Since these should always be called first and that the code in python should be stopped after an error.
Harbormaster completed remote builds in B2690: Diff 13080.Dec 31 2018, 6:36 PM
Germano Cavalcante (mano-wii) marked an inline comment as done.Dec 31 2018, 6:37 PM
Brecht Van Lommel (brecht) accepted this revision.Jan 2 2019, 12:29 PM
This revision is now accepted and ready to land.Jan 2 2019, 12:29 PM
Closed by commit rB945007b32e9a: Fix T59773: Raise exception if the gpu module is used in backgound mode. (authored by Germano Cavalcante (mano-wii)). · Explain WhyJan 2 2019, 2:03 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
source/
blender/
gpu/
1 line
intern/
7 lines
python/
gpu/
6 lines
gpu_py.h
gpu_py_api.h
10 lines
gpu_py.c
gpu_py_api.c
89 lines
2 lines
2 lines
3 lines
3 lines
4 lines
25 lines
intern/
2 lines

Diff 13077

View Options

source/blender/gpu/GPU_init_exit.h

Loading...
View Options

source/blender/gpu/intern/gpu_init_exit.c

Loading...
View Options

source/blender/python/gpu/CMakeLists.txt

Loading...
View Options

source/blender/python/gpu/gpu_py.h

Loading...
View Options

source/blender/python/gpu/gpu_py.c

Loading...
View Options

source/blender/python/gpu/gpu_py_api.h

Loading...
View Options

source/blender/python/gpu/gpu_py_api.c

Loading...
View Options

source/blender/python/gpu/gpu_py_batch.c

Loading...
View Options

source/blender/python/gpu/gpu_py_element.c

Loading...
View Options

source/blender/python/gpu/gpu_py_matrix.c

Loading...
View Options

source/blender/python/gpu/gpu_py_primitive.h

Loading...
View Options

source/blender/python/gpu/gpu_py_primitive.c

Loading...
View Options

source/blender/python/gpu/gpu_py_select.c

Loading...
View Options

source/blender/python/gpu/gpu_py_shader.c

Loading...
View Options

source/blender/python/gpu/gpu_py_types.c

Loading...
View Options

source/blender/python/intern/bpy_interface.c

Loading...