Fix #2020: PR #1977 broke HLSL member consistency, this finishes it... using an unitialized member. This commit consistently does not use those HLSL members unless ENABLE_HLSL is on.