diff options
| author | Ian Romanick <idr@us.ibm.com> | 2004-06-26 00:02:51 +0000 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2004-06-26 00:02:51 +0000 |
| commit | e16f6e3f234391027b300ec2ca8b56fc13aac825 (patch) | |
| tree | e905f64b3a7daed25d730f9c4137841ec0bf0dce | |
| parent | 9eecb03226a534e0fe59973133371b72e7c0d63d (diff) | |
| download | external_mesa3d-e16f6e3f234391027b300ec2ca8b56fc13aac825.zip external_mesa3d-e16f6e3f234391027b300ec2ca8b56fc13aac825.tar.gz external_mesa3d-e16f6e3f234391027b300ec2ca8b56fc13aac825.tar.bz2 | |
Re-enable SPARC assembly on sunos5-gcc platform.
| -rw-r--r-- | configs/sunos5-gcc | 6 | ||||
| -rw-r--r-- | src/mesa/main/context.c | 2 | ||||
| -rw-r--r-- | src/mesa/sparc/sparc.c | 7 |
3 files changed, 7 insertions, 8 deletions
diff --git a/configs/sunos5-gcc b/configs/sunos5-gcc index 59fcccf..147f69d 100644 --- a/configs/sunos5-gcc +++ b/configs/sunos5-gcc @@ -4,11 +4,13 @@ include $(TOP)/configs/default CONFIG_NAME = sunos5-gcc +ASM_SOURCES = $(SPARC_SOURCES) $(SPARC_API) + # Compiler and flags CC = gcc CXX = g++ -CFLAGS = -O3 -I/usr/openwin/include -fPIC -fomit-frame-pointer -D_REENTRANT -DUSE_XSHM -CXXFLAGS = -O3 -I/usr/openwin/include -fPIC -fomit-frame-pointer -D_REENTRANT +CFLAGS = -O3 -I/usr/openwin/include -fPIC -fomit-frame-pointer -D_REENTRANT -DUSE_XSHM -DUSE_SPARC_ASM +CXXFLAGS = -O3 -I/usr/openwin/include -fPIC -fomit-frame-pointer -D_REENTRANT -DUSE_SPARC_ASM GLUT_CFLAGS = -fexceptions -DSOLARIS_2_4_BUG GL_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index 1a185bc..67f797f 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -124,7 +124,7 @@ #endif #ifdef USE_SPARC_ASM -#include "SPARC/sparc.h" +#include "sparc/sparc.h" #endif #ifndef MESA_VERBOSE diff --git a/src/mesa/sparc/sparc.c b/src/mesa/sparc/sparc.c index 550c338..d0c6bba 100644 --- a/src/mesa/sparc/sparc.c +++ b/src/mesa/sparc/sparc.c @@ -88,9 +88,9 @@ extern GLvector4f *_mesa_sparc_cliptest_points4_np(GLvector4f *clip_vec, #define NORM_ARGS const GLmatrix *mat, \ GLfloat scale, \ - const GLvector3f *in, \ + const GLvector4f *in, \ const GLfloat *lengths, \ - GLvector3f *dest + GLvector4f *dest extern void _mesa_sparc_transform_normalize_normals(NORM_ARGS); extern void _mesa_sparc_transform_normalize_normals_no_rot(NORM_ARGS); @@ -182,6 +182,3 @@ void _mesa_init_sparc_glapi_relocs(void) } #endif /* USE_SPARC_ASM */ } - - - |