TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 16:58:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

pgraph: use bit flags instead of incremental enum for ShaderAttrib flags

Browse Source 
The flags in the enum are actual bit flags instead of indices. This allows for setting/clearing a mask of flags in one go, rather than having to set each flag in its own function call. Existing code shouldn't be affected.

Closes #688
This commit is contained in:
Brian Lach 2019-12-11 16:44:29 +01:00 committed by rdb
parent 636c3d044a
commit 48ff3aeb08
4 changed files with 53 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panda/src/pgraph/shaderAttrib.I
View File

@ -93,8 +93,8 @@ get_instance_count() const {
* *
*/ */
INLINE bool ShaderAttrib:: INLINE bool ShaderAttrib::
get_flag(int index) const { get_flag(int flag) const {
return (_flags & (1<<index)) ? true:false; return (_flags & flag) != 0;
} }
/** /**

12
panda/src/pgraph/shaderAttrib.cxx
View File

@ -172,13 +172,12 @@ clear_shader() const {
CPT(RenderAttrib) ShaderAttrib:: CPT(RenderAttrib) ShaderAttrib::
set_flag(int flag, bool value) const { set_flag(int flag, bool value) const {
ShaderAttrib *result = new ShaderAttrib(*this); ShaderAttrib *result = new ShaderAttrib(*this);
int bit = 1<<flag;
if (value) { if (value) {
result->_flags |= bit; result->_flags |= flag;
} else { } else {
result->_flags &= ~bit; result->_flags &= ~flag;
} }
result->_has_flags |= bit; result->_has_flags |= flag;
return return_new(result); return return_new(result);
} }
@ -188,9 +187,8 @@ set_flag(int flag, bool value) const {
CPT(RenderAttrib) ShaderAttrib:: CPT(RenderAttrib) ShaderAttrib::
clear_flag(int flag) const { clear_flag(int flag) const {
ShaderAttrib *result = new ShaderAttrib(*this); ShaderAttrib *result = new ShaderAttrib(*this);
int bit = 1<<flag; result->_flags &= ~flag;
result->_flags &= ~bit; result->_has_flags &= ~flag;
result->_has_flags &= ~bit;
return return_new(result); return return_new(result);
} }

8
panda/src/pgraph/shaderAttrib.h
View File

@ -47,10 +47,10 @@ PUBLISHED:
static CPT(RenderAttrib) make_default(); static CPT(RenderAttrib) make_default();
enum { enum {
F_disable_alpha_write = 0, // Suppress writes to color buffer alpha channel. F_disable_alpha_write = 1 << 0, // Suppress writes to color buffer alpha channel.
F_subsume_alpha_test = 1, // Shader promises to subsume the alpha test using TEXKILL F_subsume_alpha_test = 1 << 1, // Shader promises to subsume the alpha test using TEXKILL
F_hardware_skinning = 2, // Shader needs pre-animated vertices F_hardware_skinning = 1 << 2, // Shader needs pre-animated vertices
F_shader_point_size = 3, // Shader provides point size, not RenderModeAttrib F_shader_point_size = 1 << 3, // Shader provides point size, not RenderModeAttrib
}; };
INLINE bool has_shader() const; INLINE bool has_shader() const;

42
tests/pgraph/test_shaderattrib.py Normal file
View File

@ -0,0 +1,42 @@
from panda3d import core
def test_shaderattrib_flags():
# Ensure the old single-flag behavior still works
shattr = core.ShaderAttrib.make()
# Make sure we have the flag
shattr = shattr.set_flag(core.ShaderAttrib.F_hardware_skinning, True)
assert shattr.get_flag(core.ShaderAttrib.F_hardware_skinning)
# Make sure we don't have a flag that we didn't set
assert not shattr.get_flag(core.ShaderAttrib.F_subsume_alpha_test)
# Clear it, we should not longer have the flag
shattr = shattr.clear_flag(core.ShaderAttrib.F_hardware_skinning)
assert not shattr.get_flag(core.ShaderAttrib.F_hardware_skinning)
# Set a flag to false, we shouldn't have it
shattr = shattr.set_flag(core.ShaderAttrib.F_hardware_skinning, False)
assert not shattr.get_flag(core.ShaderAttrib.F_hardware_skinning)
# Ensure the new behavior works
shattr = core.ShaderAttrib.make()
# Make sure we have the flags
shattr = shattr.set_flag(core.ShaderAttrib.F_hardware_skinning | core.ShaderAttrib.F_subsume_alpha_test, True)
assert shattr.get_flag(core.ShaderAttrib.F_hardware_skinning | core.ShaderAttrib.F_subsume_alpha_test)
# Make sure we don't have a flag that we didn't set
assert not shattr.get_flag(core.ShaderAttrib.F_shader_point_size)
# ...group of flags we didn't set
assert not shattr.get_flag(core.ShaderAttrib.F_disable_alpha_write | core.ShaderAttrib.F_shader_point_size)
# Make sure they clear correctly
shattr = shattr.clear_flag(core.ShaderAttrib.F_hardware_skinning | core.ShaderAttrib.F_subsume_alpha_test)
assert not shattr.get_flag(core.ShaderAttrib.F_hardware_skinning | core.ShaderAttrib.F_subsume_alpha_test)
# Set group to false
shattr = shattr.set_flag(core.ShaderAttrib.F_hardware_skinning | core.ShaderAttrib.F_subsume_alpha_test, False)
assert not shattr.get_flag(core.ShaderAttrib.F_hardware_skinning | core.ShaderAttrib.F_subsume_alpha_test)