diff options
| author | Erik de Castro Lopo <erikd@mega-nerd.com> | 2017-02-27 20:35:21 +1100 |
|---|---|---|
| committer | Erik de Castro Lopo <erikd@mega-nerd.com> | 2017-02-27 20:41:25 +1100 |
| commit | 61e7dfa8bbdfdd3ad447d9fb8c21b769cc96ca25 (patch) | |
| tree | 54883f8875bdeb3a524f919d4d6ad89c601b3eea /src/libFLAC/include/private/cpu.h | |
| parent | 172146bd8a99bf2e695e580c7649182b95cba562 (diff) | |
| download | flac-61e7dfa8bbdfdd3ad447d9fb8c21b769cc96ca25.tar.gz | |
cpu.c: Merge ia32 and x86_64 CPU info functions
After the removal of the OS SSE detection stuff ia32_cpu_info()
and x86_64_cpu_info() became very similar. Merging them makes
sense.
Patch-from: lvqcl <lvqcl.mail@gmail.com>
Diffstat (limited to 'src/libFLAC/include/private/cpu.h')
| -rw-r--r-- | src/libFLAC/include/private/cpu.h | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/src/libFLAC/include/private/cpu.h b/src/libFLAC/include/private/cpu.h index d09f090a..3fe279b0 100644 --- a/src/libFLAC/include/private/cpu.h +++ b/src/libFLAC/include/private/cpu.h @@ -171,25 +171,12 @@ typedef struct { FLAC__bool avx; FLAC__bool avx2; FLAC__bool fma; -} FLAC__CPUInfo_IA32; - -typedef struct { - FLAC__bool intel; - - FLAC__bool sse3; - FLAC__bool ssse3; - FLAC__bool sse41; - FLAC__bool sse42; - FLAC__bool avx; - FLAC__bool avx2; - FLAC__bool fma; } FLAC__CPUInfo_x86; typedef struct { FLAC__bool use_asm; FLAC__CPUInfo_Type type; - FLAC__CPUInfo_IA32 ia32; FLAC__CPUInfo_x86 x86; } FLAC__CPUInfo; @@ -197,8 +184,6 @@ void FLAC__cpu_info(FLAC__CPUInfo *info); FLAC__uint32 FLAC__cpu_have_cpuid_asm_ia32(void); -void FLAC__cpu_info_asm_ia32(FLAC__uint32 *flags_edx, FLAC__uint32 *flags_ecx); - -void FLAC__cpu_info_x86(FLAC__uint32 level, FLAC__uint32 *eax, FLAC__uint32 *ebx, FLAC__uint32 *ecx, FLAC__uint32 *edx); +void FLAC__cpu_info_asm_ia32(FLAC__uint32 level, FLAC__uint32 *eax, FLAC__uint32 *ebx, FLAC__uint32 *ecx, FLAC__uint32 *edx); #endif |