diff options
| author | Alan Hourihane <alanh@tungstengraphics.com> | 2004-04-26 10:10:22 +0000 |
|---|---|---|
| committer | Alan Hourihane <alanh@tungstengraphics.com> | 2004-04-26 10:10:22 +0000 |
| commit | 462183fe4cb6df6d90632d9e2cee881c8d26b1cb (patch) | |
| tree | 0fb5d1c17d80026bec0fe3c2e0449fe30ea9e69e /src/mesa/drivers/dri/r200 | |
| parent | 08fa6de85035c428d77cb88b11a4638b706794b5 (diff) | |
bring over build fixes from stable branch
Diffstat (limited to 'src/mesa/drivers/dri/r200')
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_context.h | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_screen.c | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_vtxtmp_x86.S | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_context.h b/src/mesa/drivers/dri/r200/r200_context.h index ae7d2f47bd..69ac92b1f1 100644 --- a/src/mesa/drivers/dri/r200/r200_context.h +++ b/src/mesa/drivers/dri/r200/r200_context.h @@ -38,7 +38,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifdef GLX_DIRECT_RENDERING -#include <inttypes.h> #include "tnl/t_vertex.h" #include "drm.h" #include "radeon_drm.h" diff --git a/src/mesa/drivers/dri/r200/r200_screen.c b/src/mesa/drivers/dri/r200/r200_screen.c index e356309ae1..d115ef20fc 100644 --- a/src/mesa/drivers/dri/r200/r200_screen.c +++ b/src/mesa/drivers/dri/r200/r200_screen.c @@ -41,6 +41,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "imports.h" #include "context.h" +#define STANDALONE_MMIO #include "r200_screen.h" #include "r200_context.h" #include "r200_ioctl.h" @@ -364,6 +365,8 @@ r200CreateScreen( __DRIscreenPrivate *sPriv ) return NULL; } + RADEONMMIO = screen->mmio.map; + screen->status.handle = dri_priv->statusHandle; screen->status.size = dri_priv->statusSize; if ( drmMap( sPriv->fd, diff --git a/src/mesa/drivers/dri/r200/r200_vtxtmp_x86.S b/src/mesa/drivers/dri/r200/r200_vtxtmp_x86.S index 56a4144e8e..4ad2b6f1f0 100644 --- a/src/mesa/drivers/dri/r200/r200_vtxtmp_x86.S +++ b/src/mesa/drivers/dri/r200/r200_vtxtmp_x86.S @@ -391,6 +391,7 @@ GLOBL( _x86_MultiTexCoord2f_2 ) ret GLOBL( _x86_MultiTexCoord2f_2_end ) +#if defined(USE_SSE_ASM) /** * This can be used as a template for either Color3fv (when the color * target is also a 3f) or Normal3fv. @@ -490,3 +491,4 @@ GLOBL( _sse_MultiTexCoord2f_2 ) movlps %xmm0, (%eax) ret GLOBL( _sse_MultiTexCoord2f_2_end ) +#endif |