diff --git a/include/PICA/shader.hpp b/include/PICA/shader.hpp index c9f74f8b..94e055ba 100644 --- a/include/PICA/shader.hpp +++ b/include/PICA/shader.hpp @@ -157,15 +157,16 @@ private: u32 compSwizzle; bool negate; + using namespace Helpers; if constexpr (sourceIndex == 1) { // SRC1 - negate = (Helpers::getBit<4>(opDescriptor)) != 0; - compSwizzle = Helpers::getBits<5, 8>(opDescriptor); + negate = (getBit<4>(opDescriptor)) != 0; + compSwizzle = getBits<5, 8>(opDescriptor); } else if constexpr (sourceIndex == 2) { // SRC2 - negate = (Helpers::getBit<13>(opDescriptor)) != 0; - compSwizzle = Helpers::getBits<14, 8>(opDescriptor); + negate = (getBit<13>(opDescriptor)) != 0; + compSwizzle = getBits<14, 8>(opDescriptor); } else if constexpr (sourceIndex == 3) { // SRC3 - negate = (Helpers::getBit<22>(opDescriptor)) != 0; - compSwizzle = Helpers::getBits<23, 8>(opDescriptor); + negate = (getBit<22>(opDescriptor)) != 0; + compSwizzle = getBits<23, 8>(opDescriptor); } // Iterate through every component of the swizzled vector in reverse order @@ -263,11 +264,13 @@ public: } void uploadIntUniform(int index, u32 word) { + using namespace Helpers; + auto& u = intUniforms[index]; u.x() = word & 0xff; - u.y() = Helpers::getBits<8, 8>(word); - u.z() = Helpers::getBits<16, 8>(word); - u.w() = Helpers::getBits<24, 8>(word); + u.y() = getBits<8, 8>(word); + u.z() = getBits<16, 8>(word); + u.w() = getBits<24, 8>(word); } void run(); diff --git a/src/core/PICA/dynapica/shader_rec_emitter_x64.cpp b/src/core/PICA/dynapica/shader_rec_emitter_x64.cpp index 78ee469f..9c00387c 100644 --- a/src/core/PICA/dynapica/shader_rec_emitter_x64.cpp +++ b/src/core/PICA/dynapica/shader_rec_emitter_x64.cpp @@ -8,6 +8,8 @@ using namespace Xbyak; using namespace Xbyak::util; +using Helpers::getBit; +using Helpers::getBits; // Register that points to PICA state static constexpr Reg64 statePointer = rbp;