chacha/glide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

h3,h5, gdraw.c: adjust/tidy preprocessor conditions for grDrawTriangle()

Browse Source 
and made h3 and h5 versions look more alike
This commit is contained in:
sezero
2018-08-12 12:11:28 +03:00
parent 41324bf11c
commit 0652ba3057
2 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
glide3x/h3/glide3/src/gdraw.c
View File

@@ -185,7 +185,6 @@
* 77 11/15/97 7:43p Peter
* more comdex silliness
*
**
*/
#if SET_BSWAP
@@ -284,11 +283,10 @@ GR_ENTRY(grDrawLine, void, (const void *a, const void *b))
/*---------------------------------------------------------------------------
** grDrawTriangle
*/
#if !defined(GLIDE_DEBUG) && !(GLIDE_PLATFORM & GLIDE_OS_UNIX) && !(GLIDE_PLATFORM & GLIDE_OS_DOS32)
#if !(GLIDE_USE_C_TRISETUP)
#ifndef HAVE_XDRAWTRI_ASM /* grDrawTriangle() not in asm */
#if defined(_MSC_VER) && !defined(GLIDE_DEBUG) && !(GLIDE_USE_C_TRISETUP)
__declspec( naked )
#endif
#endif /* !defined(GLIDE_DEBUG) && !(GLIDE_PLATFORM & GLIDE_OS_UNIX) && !(GLIDE_PLATFORM & GLIDE_OS_DOS32) */
GR_ENTRY(grDrawTriangle, void, (const void *a, const void *b, const void *c))
{
#define FN_NAME "grDrawTriangle"
@@ -299,7 +297,7 @@ GR_ENTRY(grDrawTriangle, void, (const void *a, const void *b, const void *c))
{
GR_BEGIN_NOFIFOCHECK("grDrawTriangle",92);
GDBG_INFO_MORE(gc->myLevel,"(0x%x,0x%x,0x%x)\n",a,b,c);
TRISETUP(a, b, c );
TRISETUP(a, b, c);
#if GLIDE_DEBUG
/* HackAlert: Nuke the fifo ptr checking stuff here if we're just
* debugging the asm tri code.
@@ -310,7 +308,7 @@ GR_ENTRY(grDrawTriangle, void, (const void *a, const void *b, const void *c))
GR_END();
}
#elif defined(__MSC__)
#elif defined(_MSC_VER)
{
__asm {
mov eax, DWORD PTR fs:[WNT_TEB_PTR];
@@ -342,6 +340,7 @@ GR_ENTRY(grDrawTriangle, void, (const void *a, const void *b, const void *c))
#endif /* Triangle proc dispatch routine */
#undef FN_NAME
} /* grDrawTriangle */
#endif /* HAVE_XDRAWTRI_ASM */
#define DA_BEGIN \

19
glide3x/h5/glide3/src/gdraw.c
View File

@@ -190,7 +190,6 @@
* 77 11/15/97 7:43p Peter
* more comdex silliness
*
**
*/
#if SET_BSWAP
@@ -292,13 +291,13 @@ GR_ENTRY(grDrawLine, void, (const void *a, const void *b))
/*---------------------------------------------------------------------------
** grDrawTriangle
*/
#if !defined(__POWERPC__) || GLIDE_USE_C_TRISETUP
#if !defined(GLIDE_DEBUG) && !(GLIDE_PLATFORM & GLIDE_OS_UNIX) && !(GLIDE_PLATFORM & GLIDE_OS_DOS32)
#if !(GLIDE_USE_C_TRISETUP)
#if defined(__POWERPC__) && !GLIDE_USE_C_TRISETUP
#define HAVE_XDRAWTRI_ASM
#endif
#ifndef HAVE_XDRAWTRI_ASM /* grDrawTriangle() not in asm */
#if defined(_MSC_VER) && !defined(GLIDE_DEBUG) && !(GLIDE_USE_C_TRISETUP)
__declspec( naked )
#endif
#endif /* !defined(GLIDE_DEBUG) && !(GLIDE_PLATFORM & GLIDE_OS_UNIX) && !(GLIDE_PLATFORM & GLIDE_OS_DOS32) */
GR_ENTRY(grDrawTriangle, void, (const void *a, const void *b, const void *c))
{
#define FN_NAME "grDrawTriangle"
@@ -315,7 +314,7 @@ GR_ENTRY(grDrawTriangle, void, (const void *a, const void *b, const void *c))
GR_BEGIN_NOFIFOCHECK_NORET("grDrawTriangle",92);
#endif /* GLIDE_DEBUG */
GDBG_INFO_MORE(gc->myLevel,"(0x%x,0x%x,0x%x)\n",a,b,c);
TRISETUP(a, b, c );
TRISETUP(a, b, c);
#if GLIDE_DEBUG
/* HackAlert: Nuke the fifo ptr checking stuff here if we're just
* debugging the asm tri code.
@@ -327,7 +326,7 @@ GR_ENTRY(grDrawTriangle, void, (const void *a, const void *b, const void *c))
#endif /* GLIDE_DEBUG */
}
#elif defined(__MSC__)
#elif defined(_MSC_VER)
{
#if USE_STANDARD_TLS_FUNC
extern FxU32 getThreadValue(void);
@@ -372,12 +371,12 @@ GR_ENTRY(grDrawTriangle, void, (const void *a, const void *b, const void *c))
GR_END();
}
#else /* (GLIDE_PLATFORM & GLIDE_OS_UNIX) || (GLIDE_PLATFORM & GLIDE_OS_DOS32) */
#else
#error "Write triangle proc dispatch for this compiler"
#endif /* Triangle proc dispatch routine */
#undef FN_NAME
} /* grDrawTriangle */
#endif
#endif /* HAVE_XDRAWTRI_ASM */
#define DA_BEGIN \