diff options
| -rwxr-xr-x | hooks/pre-commit | 6 | ||||
| -rw-r--r-- | src/video_core/shader/shader_jit_x64.cpp | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/hooks/pre-commit b/hooks/pre-commit index bad84b14b..c100bb634 100755 --- a/hooks/pre-commit +++ b/hooks/pre-commit @@ -3,8 +3,10 @@ # Enforce citra's whitespace policy git config --local core.whitespace tab-in-indent,trailing-space +paths_to_check="src/ CMakeLists.txt" + # If there are whitespace errors, print the offending file names and fail. -if ! git diff --cached --check; then +if ! git diff --cached --check -- $paths_to_check ; then cat<<END; Error: This commit would contain trailing spaces or tabs, which is against this repo's policy. @@ -15,7 +17,7 @@ END fi # Check for tabs, since tab-in-indent catches only those at the beginning of a line -if git diff --cached | egrep '^\+.* '; then +if git diff --cached -- $paths_to_check | egrep '^\+.* '; then cat<<END; Error: This commit would contain a tab, which is against this repo's policy. If you know what you are doing, you can try 'git commit --no-verify' to bypass the check. diff --git a/src/video_core/shader/shader_jit_x64.cpp b/src/video_core/shader/shader_jit_x64.cpp index d3cfe109e..c7b63a9b7 100644 --- a/src/video_core/shader/shader_jit_x64.cpp +++ b/src/video_core/shader/shader_jit_x64.cpp @@ -434,10 +434,10 @@ void JitCompiler::Compile_SGE(Instruction instr) { Compile_SwizzleSrc(instr, 2, instr.common.src2, SRC2); } - CMPPS(SRC1, R(SRC2), CMP_NLT); - ANDPS(SRC1, R(ONE)); + CMPPS(SRC2, R(SRC1), CMP_LE); + ANDPS(SRC2, R(ONE)); - Compile_DestEnable(instr, SRC1); + Compile_DestEnable(instr, SRC2); } void JitCompiler::Compile_SLT(Instruction instr) { |