Only use x86 / SSE assembly when USE_X86_ASM / USE_SSE_ASM are defined.

This makes the driver build on x86-64 again.
This commit is contained in:
Ian Romanick 2005-05-24 23:03:15 +00:00
parent 6b5afb0036
commit e87ab8c05f
4 changed files with 9 additions and 3 deletions

View file

@ -26,6 +26,7 @@
#include "via_tex.h"
#if defined( USE_SSE_ASM )
#define SSE_PREFETCH " prefetchnta "
#define FENCE __asm__ __volatile__ ("sfence":::"memory");
@ -134,5 +135,4 @@ void via_sse_memcpy(void *to,
FENCE;
}
#endif /* defined( USE_SSE_ASM ) */

View file

@ -948,10 +948,14 @@ void viaInitTextureFuncs(struct dd_function_table * functions)
functions->DeleteTexture = _mesa_delete_texture_object;
functions->FreeTexImageData = viaFreeTextureImageData;
#if defined( USE_SSE_ASM )
if (getenv("VIA_NO_SSE"))
functions->TextureMemCpy = _mesa_memcpy;
else
functions->TextureMemCpy = via_sse_memcpy;
#else
functions->TextureMemCpy = _mesa_memcpy;
#endif
functions->UpdateTexturePalette = 0;
functions->IsTextureResident = viaIsTextureResident;

View file

@ -34,6 +34,8 @@ GLboolean viaUpdateTextureState(GLcontext *ctx);
void viaInitTextureFuncs(struct dd_function_table * functions);
GLboolean viaSwapOutWork( struct via_context *vmesa );
#if defined( USE_SSE_ASM )
void via_sse_memcpy( void *to, const void *from, size_t sz );
#endif /* defined( USE_SSE_ASM ) */
#endif

View file

@ -57,7 +57,7 @@ do { \
vb += vertsize; \
} while (0)
#else
#if 1
#if defined( USE_X86_ASM )
#define COPY_DWORDS(vb, vertsize, v) \
do { \
int j; \