Commit 996bff47 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Fix 3d Now! tests compilation

parent 125ec24e
...@@ -99,7 +99,7 @@ VLC_SSE static void SSE_test (void) ...@@ -99,7 +99,7 @@ VLC_SSE static void SSE_test (void)
asm volatile ("xorps %%xmm0,%%xmm0\n" : : : "xmm0", "xmm1"); asm volatile ("xorps %%xmm0,%%xmm0\n" : : : "xmm0", "xmm1");
} }
#endif #endif
#if defined (CAN_COMPILE_3DNOW) && !defined (__3dNOW__) #if defined (CAN_COMPILE_3DNOW)
VLC_MMX static void ThreeD_Now_test (void) VLC_MMX static void ThreeD_Now_test (void)
{ {
asm volatile ("pfadd %%mm0,%%mm0\n" "femms\n" : : : "mm0"); asm volatile ("pfadd %%mm0,%%mm0\n" "femms\n" : : : "mm0");
...@@ -222,10 +222,10 @@ void vlc_CPU_init (void) ...@@ -222,10 +222,10 @@ void vlc_CPU_init (void)
/* list these additional capabilities */ /* list these additional capabilities */
cpuid( 0x80000001 ); cpuid( 0x80000001 );
# if defined (CAN_COMPILE_3DNOW) # if defined (CAN_COMPILE_3DNOW) && !defined (__3dNOW__)
if ((i_edx & 0x80000000) && vlc_CPU_check ("3D Now!", ThreeD_Now_test)) if ((i_edx & 0x80000000) && vlc_CPU_check ("3D Now!", ThreeD_Now_test))
i_capabilities |= CPU_CAPABILITY_3DNOW;
# endif # endif
i_capabilities |= VLC_CPU_3dNOW;
if( b_amd && ( i_edx & 0x00400000 ) ) if( b_amd && ( i_edx & 0x00400000 ) )
i_capabilities |= VLC_CPU_MMXEXT; i_capabilities |= VLC_CPU_MMXEXT;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment