packages: Glide_V3/Glide_V3.spec, Glide_V3/glide-cpp.patch (NEW), Glide_V3/...

qboosh qboosh at pld-linux.org
Mon Jan 9 21:01:27 CET 2012


Author: qboosh                       Date: Mon Jan  9 20:01:27 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added gcc4,cpp,link patches
- changed URL from dead 3dfx.com to sf project site
- ghost soname symlinks

---- Files affected:
packages/Glide_V3:
   Glide_V3.spec (1.18 -> 1.19) , glide-cpp.patch (NONE -> 1.1)  (NEW), glide-gcc4.patch (NONE -> 1.1)  (NEW), glide-link.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/Glide_V3/Glide_V3.spec
diff -u packages/Glide_V3/Glide_V3.spec:1.18 packages/Glide_V3/Glide_V3.spec:1.19
--- packages/Glide_V3/Glide_V3.spec:1.18	Sat Jan 29 01:06:02 2011
+++ packages/Glide_V3/Glide_V3.spec	Mon Jan  9 21:01:22 2012
@@ -5,11 +5,13 @@
 Version:	2.60
 Release:	17
 License:	3DFX GLIDE Source Code General Public License
-Vendor:		3Dfx Interactive Inc.
 Group:		Libraries
 Source0:	GlideV3.tar.gz
 # Source0-md5:	9c690dd7b36bbe007806ac62b1366a3b
-URL:		http://www.3dfx.com/
+Patch0:		glide-gcc4.patch
+Patch1:		glide-cpp.patch
+Patch2:		glide-link.patch
+URL:		http://glide.sourceforge.net/
 %ifarch %{ix86}
 BuildRequires:	/usr/bin/gasp
 %endif
@@ -45,12 +47,19 @@
 
 %prep
 %setup -q -n GlideV3
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 chmod +x swlibs/include/make/ostype
 
+ln glide2x/README README.glide2x
+ln glide3x/README README.glide3x
+
 %build
 %{__make} V3_NODRI \
+	CC="%{__cc}" \
 	CNODEBUG="%{rpmcflags} %{!?debug:-fomit-frame-pointer}\
-	%{!?debug:-funroll-loops -fexpensive-optimizations -ffast-math -DBIG_OPT}"
+		%{!?debug:-funroll-loops -fexpensive-optimizations -ffast-math -DBIG_OPT}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -69,8 +78,8 @@
 ln -sf libglide.so.2 $RPM_BUILD_ROOT%{_libdir}/libglide.so
 
 # Create a compatibility link for the old name
-ln -sf libglide.so.2.60 $RPM_BUILD_ROOT%{_libdir}/libglide2x.so
-ln -sf libglide2x.so $RPM_BUILD_ROOT%{_libdir}/libglide2x.so.2
+ln -sf libglide.so.2.60 $RPM_BUILD_ROOT%{_libdir}/libglide2x.so.2
+ln -sf libglide.so.2 $RPM_BUILD_ROOT%{_libdir}/libglide2x.so
 
 ######################################################################
 # Install the Glide3X libraries
@@ -82,8 +91,8 @@
 ln -sf libglide3.so.3 $RPM_BUILD_ROOT%{_libdir}/libglide3.so
 
 # Create a compatibility link for the old name
+ln -sf libglide3.so.3.10 $RPM_BUILD_ROOT%{_libdir}/libglide3x.so.3
 ln -sf libglide3.so.3 $RPM_BUILD_ROOT%{_libdir}/libglide3x.so
-ln -sf libglide3x.so $RPM_BUILD_ROOT%{_libdir}/libglide3x.so.3
 
 ######################################################################
 # Install Texus
@@ -149,6 +158,8 @@
 install glide3x/h3/glide3/tests/tldata.inc $RPM_BUILD_ROOT%{_examplesdir}/glide/tests3x
 install glide3x/h3/glide3/tests/tlib.[ch] $RPM_BUILD_ROOT%{_examplesdir}/glide/tests3x
 
+/sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -163,14 +174,17 @@
 %attr(755,root,root) %{_bindir}/testGlide3x
 %attr(755,root,root) %{_bindir}/testGlide2x
 %attr(755,root,root) %{_libdir}/libglide.so.2.60
+%attr(755,root,root) %ghost %{_libdir}/libglide.so.2
 %attr(755,root,root) %{_libdir}/libglide.so
 %attr(755,root,root) %{_libdir}/libglide2x.so
 %attr(755,root,root) %{_libdir}/libglide2x.so.2
 %attr(755,root,root) %{_libdir}/libglide3.so.3.10
+%attr(755,root,root) %ghost %{_libdir}/libglide3.so.3
 %attr(755,root,root) %{_libdir}/libglide3.so
 %attr(755,root,root) %{_libdir}/libglide3x.so
 %attr(755,root,root) %{_libdir}/libglide3x.so.3
 %attr(755,root,root) %{_libdir}/libtexus.so.1.1
+%attr(755,root,root) %ghost %{_libdir}/libtexus.so.1
 %attr(755,root,root) %{_libdir}/libtexus.so
 
 %files -n Glide_SDK
@@ -186,6 +200,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2012/01/09 20:01:22  qboosh
+- added gcc4,cpp,link patches
+- changed URL from dead 3dfx.com to sf project site
+- ghost soname symlinks
+
 Revision 1.18  2011/01/29 00:06:02  sparky
 - dropped pre-cvs changelog
 

================================================================
Index: packages/Glide_V3/glide-cpp.patch
diff -u /dev/null packages/Glide_V3/glide-cpp.patch:1.1
--- /dev/null	Mon Jan  9 21:01:27 2012
+++ packages/Glide_V3/glide-cpp.patch	Mon Jan  9 21:01:22 2012
@@ -0,0 +1,302 @@
+--- GlideV2/glide3x/cvg/glide3/src/fxglide.h.orig	2000-04-20 23:26:39.000000000 +0200
++++ GlideV2/glide3x/cvg/glide3/src/fxglide.h	2012-01-08 20:16:45.707252884 +0100
+@@ -1417,7 +1417,7 @@
+ 
+ #ifdef GLIDE3
+ #define GR_STATE_ENTRY(name, type, args) \
+-   type _##name## args
++   type _##name args
+ #else
+ #define GR_STATE_ENTRY(name, type, args) \
+    GR_ENTRY(name, type, args)
+@@ -3339,17 +3339,17 @@
+ #endif
+ 
+ #ifdef GLIDE3_DEBUG
+-#define TEX_INFO(ptr,field)                         ptr##field
++#define TEX_INFO(ptr,field)                         ptr.field
+ #define G3_LOD_TRANSLATE(lod)                       (lod)
+ #define G3_ASPECT_TRANSLATE(aspect)                 (aspect)
+ #else /* !GLIDE3_DEBUG */
+-#define TEX_INFO(ptr,field)                         ptr##field##Log2
++#define TEX_INFO(ptr,field)                         ptr.field##Log2
+ #define G3_LOD_TRANSLATE(lod)                       (0x8-lod)
+ #define G3_ASPECT_TRANSLATE(aspect)                 (0x3-(aspect))
+ #endif /* !GLIDE3_DEBUG */
+ 
+ #else /* !(defined(GLIDE3) && defined(GLIDE3_ALPHA)) */
+-#define TEX_INFO(ptr,field)                         ptr##field
++#define TEX_INFO(ptr,field)                         ptr.field
+ #define G3_LOD_TRANSLATE(lod)                       (lod)
+ #define G3_ASPECT_TRANSLATE(aspect)                 (aspect)
+ #endif /* !(defined(GLIDE3) && defined(GLIDE3_ALPHA)) */
+--- GlideV2/glide3x/cvg/glide3/src/gsplash.c.orig	2000-04-20 23:26:39.000000000 +0200
++++ GlideV2/glide3x/cvg/glide3/src/gsplash.c	2012-01-08 20:16:33.697252482 +0100
+@@ -298,9 +298,9 @@
+ downloadTexture(Texture *texture, Gu3dfInfo *info) 
+ {
+   texture->info.data        = info->data;
+-  TEX_INFO(texture->info.,smallLod)    = info->header.small_lod;
+-  TEX_INFO(texture->info.,largeLod)    = info->header.large_lod;
+-  TEX_INFO(texture->info.,aspectRatio) = info->header.aspect_ratio;
++  TEX_INFO(texture->info,smallLod)    = info->header.small_lod;
++  TEX_INFO(texture->info,largeLod)    = info->header.large_lod;
++  TEX_INFO(texture->info,aspectRatio) = info->header.aspect_ratio;
+   texture->info.format      = info->header.format;
+ 
+   texture->addr = nextFreeBase;
+--- GlideV2/glide3x/cvg/glide3/src/ditex.c.orig	2000-04-20 23:26:39.000000000 +0200
++++ GlideV2/glide3x/cvg/glide3/src/ditex.c	2012-01-08 20:22:59.743932075 +0100
+@@ -568,9 +568,9 @@
+   FxU32 memrequired;
+ 
+   GR_CHECK_F( "grTexTextureMemRequired", !info, "invalid info pointer" );
+-  memrequired = _grTexTextureMemRequired( G3_LOD_TRANSLATE(TEX_INFO(info->,smallLod)),
+-                                          G3_LOD_TRANSLATE(TEX_INFO(info->,largeLod)),
+-                                          G3_ASPECT_TRANSLATE(TEX_INFO(info->,aspectRatio)),
++  memrequired = _grTexTextureMemRequired( G3_LOD_TRANSLATE(TEX_INFO((*info),smallLod)),
++                                          G3_LOD_TRANSLATE(TEX_INFO((*info),largeLod)),
++                                          G3_ASPECT_TRANSLATE(TEX_INFO((*info),aspectRatio)),
+                                           info->format,
+                                           evenOdd );
+                         
+@@ -635,12 +635,12 @@
+     ---------------------------------------------------------------*/
+ #if defined(GLIDE3) && defined(GLIDE3_ALPHA)
+ #ifdef GLIDE3_DEBUG
+-  for( lod = TEX_INFO(info->,largeLod); lod <= TEX_INFO(info->,smallLod); lod++ ) {
++  for( lod = TEX_INFO((*info),largeLod); lod <= TEX_INFO((*info),smallLod); lod++ ) {
+ #else
+-  for( lod = TEX_INFO(info->,largeLod); lod >= TEX_INFO(info->,smallLod); lod-- ) {
++  for( lod = TEX_INFO((*info),largeLod); lod >= TEX_INFO((*info),smallLod); lod-- ) {
+ #endif
+ #else
+-  for( lod = TEX_INFO(info->,largeLod); lod <= TEX_INFO(info->,smallLod); lod++ ) {
++  for( lod = TEX_INFO((*info),largeLod); lod <= TEX_INFO((*info),smallLod); lod++ ) {
+ #endif
+     /*
+     ** note for glide3 lod translation:
+@@ -649,13 +649,13 @@
+     grTexDownloadMipMapLevel( tmu, 
+                               startAddress, 
+                               lod,
+-                              TEX_INFO(info->,largeLod),
+-                              TEX_INFO(info->,aspectRatio),
++                              TEX_INFO((*info),largeLod),
++                              TEX_INFO((*info),aspectRatio),
+                               info->format,
+                               evenOdd,
+                               src_base );
+                
+-    src_base += _grMipMapHostSize[_gr_aspect_index_table[G3_ASPECT_TRANSLATE(TEX_INFO(info->,aspectRatio))]][G3_LOD_TRANSLATE(lod)]
++    src_base += _grMipMapHostSize[_gr_aspect_index_table[G3_ASPECT_TRANSLATE(TEX_INFO((*info),aspectRatio))]][G3_LOD_TRANSLATE(lod)]
+                     << (info->format>=GR_TEXFMT_16BIT);
+   }
+ } /* grTexDownloadMipMap */
+--- GlideV2/glide3x/cvg/glide3/src/gtex.c.orig	2000-04-20 23:26:39.000000000 +0200
++++ GlideV2/glide3x/cvg/glide3/src/gtex.c	2012-01-09 16:40:49.713045393 +0100
+@@ -980,16 +980,16 @@
+   /*-------------------------------------------------------------
+     Update Texture Unit State
+     -------------------------------------------------------------*/
+-  gc->state.tmu_config[tmu].smallLod = G3_LOD_TRANSLATE(TEX_INFO(info->,smallLod));
+-  gc->state.tmu_config[tmu].largeLod = G3_LOD_TRANSLATE(TEX_INFO(info->,largeLod));
++  gc->state.tmu_config[tmu].smallLod = G3_LOD_TRANSLATE(TEX_INFO((*info),smallLod));
++  gc->state.tmu_config[tmu].largeLod = G3_LOD_TRANSLATE(TEX_INFO((*info),largeLod));
+   gc->state.tmu_config[tmu].evenOdd  =  evenOdd; 
+   
+   /*-------------------------------------------------------------
+     Calculate Base Address
+     -------------------------------------------------------------*/
+   baseAddress = _grTexCalcBaseAddress(startAddress,
+-                                       G3_LOD_TRANSLATE(TEX_INFO(info->,largeLod)),
+-                                       G3_ASPECT_TRANSLATE(TEX_INFO(info->,aspectRatio)),
++                                       G3_LOD_TRANSLATE(TEX_INFO((*info),largeLod)),
++                                       G3_ASPECT_TRANSLATE(TEX_INFO((*info),aspectRatio)),
+                                        info->format,
+                                        evenOdd) >> 3;
+ #if (GLIDE_PLATFORM & GLIDE_HW_H3)
+@@ -1016,11 +1016,11 @@
+   tLod = gc->state.tmu_config[tmu].tLOD;
+   tLod &= ~(SST_LODMIN | SST_LODMAX | SST_LOD_ASPECT |
+             SST_LOD_TSPLIT | SST_LOD_ODD | SST_LOD_S_IS_WIDER);
+-  tLod |= SST_TLOD_MINMAX_INT(G3_LOD_TRANSLATE(TEX_INFO(info->,largeLod)),
++  tLod |= SST_TLOD_MINMAX_INT(G3_LOD_TRANSLATE(TEX_INFO((*info),largeLod)),
+                      gc->state.tmu_config[tmu].mmMode==GR_MIPMAP_DISABLE ? 
+-                              G3_LOD_TRANSLATE(TEX_INFO(info->,largeLod)) : G3_LOD_TRANSLATE(TEX_INFO(info->,smallLod)));
++                              G3_LOD_TRANSLATE(TEX_INFO((*info),largeLod)) : G3_LOD_TRANSLATE(TEX_INFO((*info),smallLod)));
+   tLod |= _gr_evenOdd_xlate_table[evenOdd];
+-  tLod |= _gr_aspect_xlate_table[G3_ASPECT_TRANSLATE(TEX_INFO(info->,aspectRatio))];
++  tLod |= _gr_aspect_xlate_table[G3_ASPECT_TRANSLATE(TEX_INFO((*info),aspectRatio))];
+ 
+   /* Write relevant registers out to hardware */
+   hw = SST_TMU(hw, tmu);
+@@ -1175,7 +1175,7 @@
+ #else
+                                            G3_LOD_TRANSLATE(GR_LOD_LOG2_256),
+ #endif
+-                                           G3_ASPECT_TRANSLATE(TEX_INFO(info->,aspectRatio)),
++                                           G3_ASPECT_TRANSLATE(TEX_INFO((*info),aspectRatio)),
+                                            info->format,
+                                            evenOdd) >> 3;
+       GR_SET(tmuChip, hw, texBaseAddr, baseAddress);
+@@ -1189,7 +1189,7 @@
+ #else
+                                            G3_LOD_TRANSLATE(GR_LOD_LOG2_128),
+ #endif
+-                                           G3_ASPECT_TRANSLATE(TEX_INFO(info->,aspectRatio)),
++                                           G3_ASPECT_TRANSLATE(TEX_INFO((*info),aspectRatio)),
+                                            info->format,
+                                            evenOdd) >> 3;
+       GR_SET(tmuChip, hw, texBaseAddr1, baseAddress);
+@@ -1203,7 +1203,7 @@
+ #else
+                                            G3_LOD_TRANSLATE(GR_LOD_LOG2_64),
+ #endif
+-                                           G3_ASPECT_TRANSLATE(TEX_INFO(info->,aspectRatio)),
++                                           G3_ASPECT_TRANSLATE(TEX_INFO((*info),aspectRatio)),
+                                            info->format,
+                                            evenOdd) >> 3;
+       GR_SET(tmuChip, hw, texBaseAddr2, baseAddress);
+@@ -1217,7 +1217,7 @@
+ #else
+                                            G3_LOD_TRANSLATE(GR_LOD_LOG2_32),
+ #endif
+-                                           G3_ASPECT_TRANSLATE(TEX_INFO(info->,aspectRatio)),
++                                           G3_ASPECT_TRANSLATE(TEX_INFO((*info),aspectRatio)),
+                                            info->format,
+                                            evenOdd) >> 3;
+       GR_SET(tmuChip, hw, texBaseAddr38, baseAddress);
+--- GlideV2/glide3x/cvg/glide3/src/distate.c.orig	2000-04-20 23:26:39.000000000 +0200
++++ GlideV2/glide3x/cvg/glide3/src/distate.c	2012-01-09 16:50:12.976397585 +0100
+@@ -166,25 +166,25 @@
+  */
+ 
+ #define STOREARG(function, arg) \
+-gc->state.stateArgs.##function##Args.arg = arg
++gc->state.stateArgs.function##Args.arg = arg
+ 
+ #define LOADARG(function, arg) \
+-gc->state.stateArgs.##function##Args.arg
++gc->state.stateArgs.function##Args.arg
+ 
+ #define INVALIDATE(regset) \
+-gc->state.invalid |= ##regset##BIT
++gc->state.invalid |= regset##BIT
+ 
+ #define NOTVALID(regset) \
+-(gc->state.invalid & ##regset##BIT)
++(gc->state.invalid & regset##BIT)
+ 
+ #define SETVALID(regset) \
+-(gc->state.invalid &= ~(##regset##BIT))
++(gc->state.invalid &= ~(regset##BIT))
+ 
+ #define ENABLEMODE(mode) \
+-gc->state.grEnableArgs.##mode## = GR_MODE_ENABLE;
++gc->state.grEnableArgs.mode = GR_MODE_ENABLE;
+ 
+ #define DISABLEMODE(mode) \
+-gc->state.grEnableArgs.##mode## = GR_MODE_DISABLE;
++gc->state.grEnableArgs.mode = GR_MODE_DISABLE;
+ 
+ /*-------------------------------------------------------------------
+   Function: grAlphaBlendFunction
+--- GlideV3/glide2x/h3/glide/src/fxglide.h.orig	2000-03-20 22:51:02.000000000 +0100
++++ GlideV3/glide2x/h3/glide/src/fxglide.h	2012-01-09 19:28:24.303382057 +0100
+@@ -1346,7 +1346,7 @@
+ 
+ #ifdef GLIDE3
+ #define GR_STATE_ENTRY(name, type, args) \
+-   type _##name## args
++   type _##name args
+ #else
+ #define GR_STATE_ENTRY(name, type, args) \
+    GR_ENTRY(name, type, args)
+@@ -3356,16 +3356,16 @@
+ //#define GLIDE3_DEBUG 1
+ #endif
+ #ifdef GLIDE3_DEBUG
+-#define TEX_INFO(ptr,field)                         ptr##field
++#define TEX_INFO(ptr,field)                         ptr.field
+ #define G3_LOD_TRANSLATE(lod)                       (lod)
+ #define G3_ASPECT_TRANSLATE(aspect)                 (aspect)
+ #else
+-#define TEX_INFO(ptr,field)                         ptr##field##Log2
++#define TEX_INFO(ptr,field)                         ptr.field##Log2
+ #define G3_LOD_TRANSLATE(lod)                       (0x8-lod)
+ #define G3_ASPECT_TRANSLATE(aspect)                 (0x3-(aspect))
+ #endif /* GLIDE3_DEBUG */
+ #else
+-#define TEX_INFO(ptr,field)                         ptr##field
++#define TEX_INFO(ptr,field)                         ptr.field
+ #define G3_LOD_TRANSLATE(lod)                       (lod)
+ #define G3_ASPECT_TRANSLATE(aspect)                 (aspect)
+ #endif
+--- GlideV3/glide2x/h3/glide/src/gsplash.c.orig	2000-03-20 22:51:02.000000000 +0100
++++ GlideV3/glide2x/h3/glide/src/gsplash.c	2012-01-09 19:29:02.846716682 +0100
+@@ -242,9 +242,9 @@
+ downloadTexture(Texture *texture, Gu3dfInfo *info) 
+ {
+   texture->info.data        = info->data;
+-  TEX_INFO(texture->info.,smallLod)    = info->header.small_lod;
+-  TEX_INFO(texture->info.,largeLod)    = info->header.large_lod;
+-  TEX_INFO(texture->info.,aspectRatio) = info->header.aspect_ratio;
++  TEX_INFO(texture->info,smallLod)    = info->header.small_lod;
++  TEX_INFO(texture->info,largeLod)    = info->header.large_lod;
++  TEX_INFO(texture->info,aspectRatio) = info->header.aspect_ratio;
+   texture->info.format      = info->header.format;
+ 
+   texture->addr = nextFreeBase;
+--- GlideV3/glide3x/h3/glide3/src/fxglide.h.orig	2000-03-20 22:51:03.000000000 +0100
++++ GlideV3/glide3x/h3/glide3/src/fxglide.h	2012-01-09 19:36:04.676730806 +0100
+@@ -1498,7 +1498,7 @@
+ 
+ #ifdef GLIDE3
+ #define GR_STATE_ENTRY(name, type, args) \
+-   type _##name## args
++   type _##name args
+ #else
+ #define GR_STATE_ENTRY(name, type, args) \
+    GR_ENTRY(name, type, args)
+@@ -1805,7 +1805,7 @@
+ #define CUR_TRI_PROC(__checkValidP, __cullP) \
+   (*gc->archDispatchProcs.coorModeTriVector)[__checkValidP][__cullP]
+ #define INVALIDATE(regset) {\
+-  gc->state.invalid |= ##regset##BIT; \
++  gc->state.invalid |= regset##BIT; \
+   gc->triSetupProc = CUR_TRI_PROC(FXTRUE, (gc->state.cull_mode != GR_CULL_DISABLE)); \
+ }
+ 
+--- GlideV3/glide3x/h3/glide3/src/distate.c.orig	2000-03-20 22:51:03.000000000 +0100
++++ GlideV3/glide3x/h3/glide3/src/distate.c	2012-01-09 19:41:31.226741741 +0100
+@@ -199,23 +199,23 @@
+  */
+ 
+ #define STOREARG(function, arg) \
+-gc->state.stateArgs.##function##Args.arg = arg
++gc->state.stateArgs.function##Args.arg = arg
+ 
+ #define LOADARG(function, arg) \
+-gc->state.stateArgs.##function##Args.arg
++gc->state.stateArgs.function##Args.arg
+ 
+ 
+ #define NOTVALID(regset) \
+-(gc->state.invalid & ##regset##BIT)
++(gc->state.invalid & regset##BIT)
+ 
+ #define SETVALID(regset) \
+-(gc->state.invalid &= ~(##regset##BIT))
++(gc->state.invalid &= ~(regset##BIT))
+ 
+ #define ENABLEMODE(mode) \
+-gc->state.grEnableArgs.##mode## = GR_MODE_ENABLE;
++gc->state.grEnableArgs.mode = GR_MODE_ENABLE;
+ 
+ #define DISABLEMODE(mode) \
+-gc->state.grEnableArgs.##mode## = GR_MODE_DISABLE;
++gc->state.grEnableArgs.mode = GR_MODE_DISABLE;
+ 
+ /*-------------------------------------------------------------------
+   Function: grAlphaBlendFunction

================================================================
Index: packages/Glide_V3/glide-gcc4.patch
diff -u /dev/null packages/Glide_V3/glide-gcc4.patch:1.1
--- /dev/null	Mon Jan  9 21:01:27 2012
+++ packages/Glide_V3/glide-gcc4.patch	Mon Jan  9 21:01:22 2012
@@ -0,0 +1,584 @@
+--- GlideV3.orig/glide2x/cvg/glide/tests/display.c
++++ GlideV3/glide2x/cvg/glide/tests/display.c
+@@ -65,6 +65,10 @@ static const char *sourceFormatString[] 
+     "GR_LFB_SRC_FMT_ZA16      "
+ };
+ 
++static void imageConvert( void *dst,
++                          void *src,
++                          GrLfbSrcFmt_t format,
++                          FxU32 *bpp );
+ 
+ int main( int argc, char **argv)
+ {
+@@ -91,11 +95,6 @@ int main( int argc, char **argv)
+     static FxU32 imageWidth;
+     static FxU32 imageHeight;
+ 
+-    static void imageConvert( void *dst, 
+-                              void *src,
+-                              GrLfbSrcFmt_t format, 
+-                              FxU32 *bpp );
+-
+     srcfname[0] = 0;
+     dstfname[0] = 0;
+ 
+--- GlideV3.orig/glide2x/cvg/glide/tests/test26.c
++++ GlideV3/glide2x/cvg/glide/tests/test26.c
+@@ -57,6 +57,10 @@ static const char *sourceFormatString[] 
+   "GR_LFB_SRC_FMT_ZA16      "
+ };
+ 
++static void imageConvert( void *dst,
++                          void *src,
++                          GrLfbSrcFmt_t format,
++                          FxU32 *bpp );
+ 
+ int main( int argc, char **argv) {
+   char match; 
+@@ -80,11 +84,6 @@ int main( int argc, char **argv) {
+   static FxU32 imageWidth;
+   static FxU32 imageHeight;
+ 
+-  static void imageConvert( void *dst, 
+-                            void *src,
+-                            GrLfbSrcFmt_t format, 
+-                            FxU32 *bpp );
+-
+   /* Process Command Line Arguments */
+   while( (rv = tlGetOpt( argc, argv, "bdnr", &match, &remArgs )) ) {
+     if ( rv == -1 ) {
+--- GlideV3.orig/glide2x/h3/glide/src/xdraw2.inc.S
++++ GlideV3/glide2x/h3/glide/src/xdraw2.inc.S
+@@ -41,13 +41,18 @@
+ 
+ .file "xdraw2.inc"
+ 
+-#ifdef GL_AMD3D
+-	
++#ifndef GR_FIFO_WRITE_MACRO
++#define GR_FIFO_WRITE_MACRO
+ .MACRO	GR_FIFO_WRITE __addr __offset __data
+ 	mov \__data , \__offset(\__addr)
+ .ENDM 	/*  GR_FIFO_WRITE */
++#endif
+ 
++#ifdef GL_AMD3D
++	
+ 
++#ifndef MM1_FIFO_MACROS
++#define MM1_FIFO_MACROS
+ .MACRO  WRITE_MM1_FIFO_ALIGNED
+ 	movq %mm1 , (%ebp)	/*  store current param | previous param */
+ .ENDM 	/*  WRITE_MM1_FIFO_ALIGNED */
+@@ -55,6 +60,7 @@
+ .MACRO  WRITE_MM1LOW_FIFO
+ 	movd %mm1 , (%ebp)	/*  store current param | previous param */
+ .ENDM 	/*  WRITE_MM1LOW_FIFO */
++#endif
+ 
+ #define gc %edi	/*  points to graphics context */
+ #define fifo %ebp	/*  points to fifo entries */
+@@ -1103,10 +1109,6 @@ LOCAL(Area_Computation):
+ #define packCol %edi
+ #define tempVal %edi
+ 
+-.MACRO  GR_FIFO_WRITE __addr __offset __data
+-	mov \__data , \__offset(\__addr)
+-.ENDM 	/*  GR_FIFO_WRITE */
+-
+ .align 4
+ LOCAL(__triBegin):
+ 	mov fifoPtr(gc) , fifo	/*  Fetch Fifo Ptr */
+--- GlideV3.orig/glide2x/h3/glide/tests/display.c
++++ GlideV3/glide2x/h3/glide/tests/display.c
+@@ -65,6 +65,10 @@ static const char *sourceFormatString[] 
+     "GR_LFB_SRC_FMT_ZA16      "
+ };
+ 
++static void imageConvert( void *dst,
++                          void *src,
++                          GrLfbSrcFmt_t format,
++                          FxU32 *bpp );
+ 
+ int main( int argc, char **argv)
+ {
+@@ -91,11 +95,6 @@ int main( int argc, char **argv)
+     static FxU32 imageWidth;
+     static FxU32 imageHeight;
+ 
+-    static void imageConvert( void *dst, 
+-                              void *src,
+-                              GrLfbSrcFmt_t format, 
+-                              FxU32 *bpp );
+-
+     srcfname[0] = 0;
+     dstfname[0] = 0;
+ 
+--- GlideV3.orig/glide2x/h3/glide/tests/test26.c
++++ GlideV3/glide2x/h3/glide/tests/test26.c
+@@ -57,6 +57,10 @@ static const char *sourceFormatString[] 
+   "GR_LFB_SRC_FMT_ZA16      "
+ };
+ 
++static void imageConvert( void *dst,
++                          void *src,
++                          GrLfbSrcFmt_t format,
++                          FxU32 *bpp );
+ 
+ int main( int argc, char **argv) {
+   char match; 
+@@ -80,11 +84,6 @@ int main( int argc, char **argv) {
+   static FxU32 imageWidth;
+   static FxU32 imageHeight;
+ 
+-  static void imageConvert( void *dst, 
+-                            void *src,
+-                            GrLfbSrcFmt_t format, 
+-                            FxU32 *bpp );
+-
+   /* Process Command Line Arguments */
+   while( (rv = tlGetOpt( argc, argv, "bdnr", &match, &remArgs )) ) {
+     if ( rv == -1 ) {
+--- GlideV3.orig/glide2x/sst1/glide/tests/display.c
++++ GlideV3/glide2x/sst1/glide/tests/display.c
+@@ -70,6 +70,10 @@ static const char *sourceFormatString[] 
+     "GR_LFB_SRC_FMT_ZA16      "
+ };
+ 
++static void imageConvert( void *dst,
++                          void *src,
++                          GrLfbSrcFmt_t format,
++                          FxU32 *bpp );
+ 
+ void main( int argc, char **argv) {
+     char match; 
+@@ -95,11 +99,6 @@ void main( int argc, char **argv) {
+     static FxU32 imageWidth;
+     static FxU32 imageHeight;
+ 
+-    static void imageConvert( void *dst, 
+-                              void *src,
+-                              GrLfbSrcFmt_t format, 
+-                              FxU32 *bpp );
+-
+     srcfname[0] = 0;
+     dstfname[0] = 0;
+ 
+--- GlideV3.orig/glide2x/sst1/glide/tests/test26.c
++++ GlideV3/glide2x/sst1/glide/tests/test26.c
+@@ -62,6 +62,10 @@ static const char *sourceFormatString[] 
+   "GR_LFB_SRC_FMT_ZA16      "
+ };
+ 
++static void imageConvert( void *dst,
++                          void *src,
++                          GrLfbSrcFmt_t format,
++                          FxU32 *bpp );
+ 
+ void main( int argc, char **argv) {
+   char match; 
+@@ -85,11 +89,6 @@ void main( int argc, char **argv) {
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/Glide_V3/Glide_V3.spec?r1=1.18&r2=1.19&f=u



More information about the pld-cvs-commit mailing list