diff options
author | Kendall Bennett <[email protected]> | 1999-11-12 04:56:54 +0000 |
---|---|---|
committer | Kendall Bennett <[email protected]> | 1999-11-12 04:56:54 +0000 |
commit | e312cf26ea1ae0445926df20c43e80363d453cb5 (patch) | |
tree | 6e13b3e4f76081cc0edc61e5941b1b140c771e3a /src/mesa/drivers/d3d | |
parent | b95d252c347e14825cd61b28223040cfc5d0e7de (diff) |
. Updates to get X86, MXX and 3DNow assembler code working with Watcom
C++ and NASM. This includes lots of _ASMAPI macros to ensure that
assembler functions are prototyped as __cdecl, as Watcom C++ uses
register calling conventions by default.
. Misc fixes to files to remove warnings generated by Watcom C++.
Diffstat (limited to 'src/mesa/drivers/d3d')
-rw-r--r-- | src/mesa/drivers/d3d/D3DCAPS.CPP | 1 | ||||
-rw-r--r-- | src/mesa/drivers/d3d/D3DHAL.H | 1 | ||||
-rw-r--r-- | src/mesa/drivers/d3d/D3DMESA.H | 1 | ||||
-rw-r--r-- | src/mesa/drivers/d3d/D3DRaster.cpp | 1 | ||||
-rw-r--r-- | src/mesa/drivers/d3d/D3DTEXT.CPP | 1 | ||||
-rw-r--r-- | src/mesa/drivers/d3d/D3DTextureMgr.cpp | 1 | ||||
-rw-r--r-- | src/mesa/drivers/d3d/D3DTextureMgr.h | 1 | ||||
-rw-r--r-- | src/mesa/drivers/d3d/D3DUTILS.CPP | 1 | ||||
-rw-r--r-- | src/mesa/drivers/d3d/D3Dvbrender.c | 1 | ||||
-rw-r--r-- | src/mesa/drivers/d3d/DDrawPROCS.c | 1 | ||||
-rw-r--r-- | src/mesa/drivers/d3d/DEBUG.C | 1 | ||||
-rw-r--r-- | src/mesa/drivers/d3d/DEBUG.H | 1 | ||||
-rw-r--r-- | src/mesa/drivers/d3d/MAKEFILE | 1 | ||||
-rw-r--r-- | src/mesa/drivers/d3d/NullProcs.c | 1 | ||||
-rw-r--r-- | src/mesa/drivers/d3d/OPENGL32.DEF | 1 |
15 files changed, 0 insertions, 15 deletions
diff --git a/src/mesa/drivers/d3d/D3DCAPS.CPP b/src/mesa/drivers/d3d/D3DCAPS.CPP index 53595f0c34e..cd95ef0f1ee 100644 --- a/src/mesa/drivers/d3d/D3DCAPS.CPP +++ b/src/mesa/drivers/d3d/D3DCAPS.CPP @@ -248,4 +248,3 @@ void AlphaBlendTableHAL( PMESAD3DHAL pHAL ) }
}
-
\ No newline at end of file diff --git a/src/mesa/drivers/d3d/D3DHAL.H b/src/mesa/drivers/d3d/D3DHAL.H index 12f4b4e728e..5295520d7be 100644 --- a/src/mesa/drivers/d3d/D3DHAL.H +++ b/src/mesa/drivers/d3d/D3DHAL.H @@ -66,4 +66,3 @@ extern char *errorMsg; #endif
-
\ No newline at end of file diff --git a/src/mesa/drivers/d3d/D3DMESA.H b/src/mesa/drivers/d3d/D3DMESA.H index 907f69ffb17..792f34d1f17 100644 --- a/src/mesa/drivers/d3d/D3DMESA.H +++ b/src/mesa/drivers/d3d/D3DMESA.H @@ -82,4 +82,3 @@ extern D3DTLVERTEX D3DTLVertices[(VB_MAX*6)]; #endif
-
\ No newline at end of file diff --git a/src/mesa/drivers/d3d/D3DRaster.cpp b/src/mesa/drivers/d3d/D3DRaster.cpp index b87b3abd6d3..004bb773603 100644 --- a/src/mesa/drivers/d3d/D3DRaster.cpp +++ b/src/mesa/drivers/d3d/D3DRaster.cpp @@ -211,4 +211,3 @@ extern "C" void SetStateHAL( PMESAD3DSHARED pShared, DWORD dwType, DWORD dwState -
\ No newline at end of file diff --git a/src/mesa/drivers/d3d/D3DTEXT.CPP b/src/mesa/drivers/d3d/D3DTEXT.CPP index 7321eeb7c44..e6ff8645611 100644 --- a/src/mesa/drivers/d3d/D3DTEXT.CPP +++ b/src/mesa/drivers/d3d/D3DTEXT.CPP @@ -574,4 +574,3 @@ static int ConvertCharacter( char *c, int cIndex, PD3DFONTMETRICS pfntMetrics ) #undef BRIGHT
#undef RIGHT
#undef ALL
-
\ No newline at end of file diff --git a/src/mesa/drivers/d3d/D3DTextureMgr.cpp b/src/mesa/drivers/d3d/D3DTextureMgr.cpp index 9375e51e32e..ac9d2621fcc 100644 --- a/src/mesa/drivers/d3d/D3DTextureMgr.cpp +++ b/src/mesa/drivers/d3d/D3DTextureMgr.cpp @@ -945,4 +945,3 @@ HRESULT CALLBACK EnumPFHook( LPDDPIXELFORMAT lpDDPixFmt, LPVOID lpContext ) }
-
\ No newline at end of file diff --git a/src/mesa/drivers/d3d/D3DTextureMgr.h b/src/mesa/drivers/d3d/D3DTextureMgr.h index 6b3ac785607..f4a4154917a 100644 --- a/src/mesa/drivers/d3d/D3DTextureMgr.h +++ b/src/mesa/drivers/d3d/D3DTextureMgr.h @@ -60,4 +60,3 @@ void APIENTRY TermTMD3D( void *pVoid ); /*========================================================================*/
#endif
-
\ No newline at end of file diff --git a/src/mesa/drivers/d3d/D3DUTILS.CPP b/src/mesa/drivers/d3d/D3DUTILS.CPP index 381e09f2a13..c13d89cd711 100644 --- a/src/mesa/drivers/d3d/D3DUTILS.CPP +++ b/src/mesa/drivers/d3d/D3DUTILS.CPP @@ -636,4 +636,3 @@ char *ErrorStringD3D( HRESULT hr ) return &errorString[0];
}
-
\ No newline at end of file diff --git a/src/mesa/drivers/d3d/D3Dvbrender.c b/src/mesa/drivers/d3d/D3Dvbrender.c index 57c1306d605..6ed8037902b 100644 --- a/src/mesa/drivers/d3d/D3Dvbrender.c +++ b/src/mesa/drivers/d3d/D3Dvbrender.c @@ -2147,4 +2147,3 @@ static void DebugRenderStates( GLcontext *ctx, BOOL bForce ) } } } - diff --git a/src/mesa/drivers/d3d/DDrawPROCS.c b/src/mesa/drivers/d3d/DDrawPROCS.c index 33a1e47bba3..a02a89debbb 100644 --- a/src/mesa/drivers/d3d/DDrawPROCS.c +++ b/src/mesa/drivers/d3d/DDrawPROCS.c @@ -397,4 +397,3 @@ void RPixelsRGBA( const GLcontext* ctx, GLuint n, const GLint x[], const GLint y /* Giver back. */
UnlockHAL( pContext->pShared, TRUE );
}
-
\ No newline at end of file diff --git a/src/mesa/drivers/d3d/DEBUG.C b/src/mesa/drivers/d3d/DEBUG.C index 26c2c25be75..dfa524bf314 100644 --- a/src/mesa/drivers/d3d/DEBUG.C +++ b/src/mesa/drivers/d3d/DEBUG.C @@ -141,4 +141,3 @@ void DebugPixelFormat( char *pszSurfaceName, DDPIXELFORMAT *pddpf ) -
\ No newline at end of file diff --git a/src/mesa/drivers/d3d/DEBUG.H b/src/mesa/drivers/d3d/DEBUG.H index e63d6c500c5..76122b91210 100644 --- a/src/mesa/drivers/d3d/DEBUG.H +++ b/src/mesa/drivers/d3d/DEBUG.H @@ -88,4 +88,3 @@ extern DWORD g_DBGMask; -
\ No newline at end of file diff --git a/src/mesa/drivers/d3d/MAKEFILE b/src/mesa/drivers/d3d/MAKEFILE index 59734cfd32a..ad1d40dc27b 100644 --- a/src/mesa/drivers/d3d/MAKEFILE +++ b/src/mesa/drivers/d3d/MAKEFILE @@ -99,4 +99,3 @@ forceit: -
\ No newline at end of file diff --git a/src/mesa/drivers/d3d/NullProcs.c b/src/mesa/drivers/d3d/NullProcs.c index e8f18545d11..60e4010f913 100644 --- a/src/mesa/drivers/d3d/NullProcs.c +++ b/src/mesa/drivers/d3d/NullProcs.c @@ -127,4 +127,3 @@ void NULLRePiRGBA( const GLcontext* ctx, GLuint n, const GLint x[], const GLint -
\ No newline at end of file diff --git a/src/mesa/drivers/d3d/OPENGL32.DEF b/src/mesa/drivers/d3d/OPENGL32.DEF index 19762bbebe4..b32bd1fef81 100644 --- a/src/mesa/drivers/d3d/OPENGL32.DEF +++ b/src/mesa/drivers/d3d/OPENGL32.DEF @@ -440,4 +440,3 @@ EXPORTS -
\ No newline at end of file |