diff options
| author | Twinaphex | 2016-04-22 17:06:53 +0200 |
|---|---|---|
| committer | Twinaphex | 2016-04-22 17:06:53 +0200 |
| commit | 18ef7635b0b265350eb8304a26edeb8d4b0b2e19 (patch) | |
| tree | 93e9704ebb9395c4f6c7bab847d9df7abb005d3d /plugins/gpu_unai | |
| parent | 4ed8f00a1221b15925117f1c7413b4640e6e7198 (diff) | |
| parent | 163249087400935f084080127990bc762e83319c (diff) | |
| download | pcsx_rearmed-18ef7635b0b265350eb8304a26edeb8d4b0b2e19.tar.gz pcsx_rearmed-18ef7635b0b265350eb8304a26edeb8d4b0b2e19.tar.bz2 pcsx_rearmed-18ef7635b0b265350eb8304a26edeb8d4b0b2e19.zip | |
Merge pull request #33 from dankcushions/master
Merging in latest upstream changes
Diffstat (limited to 'plugins/gpu_unai')
| -rw-r--r-- | plugins/gpu_unai/gpulib_if.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/gpu_unai/gpulib_if.cpp b/plugins/gpu_unai/gpulib_if.cpp index 646b0f2..2dedbf8 100644 --- a/plugins/gpu_unai/gpulib_if.cpp +++ b/plugins/gpu_unai/gpulib_if.cpp @@ -23,6 +23,7 @@ #include <stdlib.h> #include <string.h> #include "../gpulib/gpu.h" +#include "arm_features.h" #define u8 uint8_t #define s8 int8_t @@ -171,7 +172,7 @@ int do_cmd_list(unsigned int *list, int list_len, int *last_cmd) unsigned int *list_end = list + list_len; linesInterlace = force_interlace; -#ifndef __ARM_ARCH_7A__ /* XXX */ +#ifdef HAVE_PRE_ARMV7 /* XXX */ linesInterlace |= gpu.status.interlace; #endif |