Merge branch 'gallium-0.2' of git+ssh://marcheu@git.freedesktop.org/git/mesa/mesa into gallium-0.2

This commit is contained in:
Stephane Marchesin 2008-10-07 21:11:14 +02:00
commit ba86520cf7
5 changed files with 12 additions and 4 deletions

View file

@ -37,7 +37,7 @@
#include "draw_vs.h"
#if defined(PIPE_ARCH_X86)
#if defined(PIPE_ARCH_X86) && defined(PIPE_ARCH_SSE)
#include "pipe/p_shader_tokens.h"

View file

@ -27,7 +27,7 @@
#include "pipe/p_config.h"
#ifdef PIPE_ARCH_X86
#if defined(PIPE_ARCH_X86) && defined(PIPE_ARCH_SSE)
#include "pipe/p_debug.h"
#include "pipe/p_shader_tokens.h"

View file

@ -39,7 +39,7 @@
#include "pipe/p_config.h"
#if defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64)
#if defined(PIPE_ARCH_SSE)
#include <xmmintrin.h>
#include <emmintrin.h>

View file

@ -40,7 +40,7 @@
#include "tgsi/tgsi_sse2.h"
#ifdef PIPE_ARCH_X86
#if defined(PIPE_ARCH_X86) && defined(PIPE_ARCH_SSE)
#include "rtasm/rtasm_x86sse.h"

View file

@ -85,6 +85,14 @@
#define PIPE_ARCH_X86_64
#endif
#if defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64)
#if defined(PIPE_CC_GCC) && !defined(__SSE2__)
/* #warning SSE2 support requires -msse -msse2 compiler options */
#else
#define PIPE_ARCH_SSE
#endif
#endif
#if 0 /* FIXME */
#define PIPE_ARCH_PPC
#endif