X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=mupen64plus-pandora.git;a=blobdiff_plain;f=source%2Fgles2glide64%2Fsrc%2FGlideHQ%2Ftc-1.1%2B%2Finternal.h;h=7252b21f565fd2c3f4dec5250cf4b63a1e3f8931;hp=f1cd6dca9285ef659cc283e4a07bdb705bedfc9a;hb=2d26287291331f2b1793a8e76ede08c75654fb7c;hpb=01d8ca6fb06a8261602900cab63c61e5a1b143c9

diff --git a/source/gles2glide64/src/GlideHQ/tc-1.1+/internal.h b/source/gles2glide64/src/GlideHQ/tc-1.1+/internal.h
index f1cd6dc..7252b21 100644
--- a/source/gles2glide64/src/GlideHQ/tc-1.1+/internal.h
+++ b/source/gles2glide64/src/GlideHQ/tc-1.1+/internal.h
@@ -23,6 +23,8 @@
 #ifndef INTERNAL_H_included
 #define INTERNAL_H_included
 
+#include <stdint.h>
+
 /*****************************************************************************\
  * DLL stuff
 \*****************************************************************************/
@@ -40,34 +42,42 @@
  * 64bit types on 32bit machine
 \*****************************************************************************/
 
-#if (defined(__GNUC__) && !defined(__cplusplus)) || defined(__MSC__)
+/*
+ * Define a 64-bit unsigned integer type and macros
+ */
+#if 1
+
+#define Q_NATIVE 1
 
-typedef unsigned long long qword;
+typedef uint64_t qword;
 
 #define Q_MOV32(a, b) a = b
 #define Q_OR32(a, b)  a |= b
 #define Q_SHL(a, c)   a <<= c
 
-#else  /* !__GNUC__ */
+#else
+
+#define Q_NATIVE 0
 
 typedef struct {
-    dword lo, hi;
+   dword lo, hi;
 } qword;
 
 #define Q_MOV32(a, b) a.lo = b
 #define Q_OR32(a, b)  a.lo |= b
-#define Q_SHL(a, c)					\
-    do {						\
-	if ((c) >= 32) {				\
-	    a.hi = a.lo << ((c) - 32);			\
-	    a.lo = 0;					\
-	} else {					\
-	    a.hi = (a.hi << (c)) | (a.lo >> (32 - (c)));\
-	    a.lo <<= c;					\
-	}						\
-    } while (0)
 
-#endif /* !__GNUC__ */
+#define Q_SHL(a, c)                                 \
+   do {                                                \
+       if ((c) >= 32) {                                \
+          a.hi = a.lo << ((c) - 32);                   \
+          a.lo = 0;                                    \
+       } else {                                        \
+          a.hi = (a.hi << (c)) | (a.lo >> (32 - (c))); \
+          a.lo <<= (c);                                \
+       }                                               \
+   } while (0)
+
+#endif
 
 
 /*****************************************************************************\
@@ -86,52 +96,71 @@ typedef struct {
 #define F(i) (float)1 /* can be used to obtain an oblong metric: 0.30 / 0.59 / 0.11 */
 #define SAFECDOT 1 /* for paranoids */
 
-#define MAKEIVEC(NV, NC, IV, B, V0, V1)	\
-    do {				\
-	/* compute interpolation vector */\
-	float d2 = 0.0F;		\
-	float rd2;			\
-					\
-	for (i = 0; i < NC; i++) {	\
-	    IV[i] = (V1[i] - V0[i]) * F(i);\
-	    d2 += IV[i] * IV[i];	\
-	}				\
-	rd2 = (float)NV / d2;		\
-	B = 0;				\
-	for (i = 0; i < NC; i++) {	\
-	    IV[i] *= F(i);		\
-	    B -= IV[i] * V0[i];		\
-	    IV[i] *= rd2;		\
-	}				\
-	B = B * rd2 + 0.5F;		\
-    } while (0)
+#define MAKEIVEC(NV, NC, IV, B, V0, V1)  \
+   do {                                  \
+      /* compute interpolation vector */ \
+      float d2 = 0.0F;                   \
+      float rd2;                         \
+                                         \
+      for (i = 0; i < NC; i++) {         \
+         IV[i] = (V1[i] - V0[i]) * F(i); \
+         d2 += IV[i] * IV[i];            \
+      }                                  \
+      rd2 = (float)NV / d2;              \
+      B = 0;                             \
+      for (i = 0; i < NC; i++) {         \
+         IV[i] *= F(i);                  \
+         B -= IV[i] * V0[i];             \
+         IV[i] *= rd2;                   \
+      }                                  \
+      B = B * rd2 + 0.5f;                \
+   } while (0)
 
 #define CALCCDOT(TEXEL, NV, NC, IV, B, V)\
-    do {				\
-	float dot = 0.0F;		\
-	for (i = 0; i < NC; i++) {	\
-	    dot += V[i] * IV[i];	\
-	}				\
-	TEXEL = (int)(dot + B);		\
-	if (SAFECDOT) {			\
-	    if (TEXEL < 0) {		\
-		TEXEL = 0;		\
-	    } else if (TEXEL > NV) {	\
-		TEXEL = NV;		\
-	    }				\
-	}				\
-    } while (0)
+   do {                                  \
+      float dot = 0.0F;                  \
+      for (i = 0; i < NC; i++) {         \
+         dot += V[i] * IV[i];            \
+      }                                  \
+      TEXEL = (int)(dot + B);            \
+      if (SAFECDOT) {                    \
+         if (TEXEL < 0) {                \
+            TEXEL = 0;                   \
+         } else if (TEXEL > NV) {        \
+            TEXEL = NV;                  \
+         }                               \
+      }                                  \
+   } while (0)
 
 
 /*****************************************************************************\
  * Utility functions
 \*****************************************************************************/
 
-void
-_mesa_upscale_teximage2d (unsigned int inWidth, unsigned int inHeight,
-			  unsigned int outWidth, unsigned int outHeight,
-			  unsigned int comps,
-			  const byte *src, int srcRowStride,
-			  unsigned char *dest);
+/** Copy a 4-element vector */
+#define COPY_4V( DST, SRC )         \
+do {                                \
+   (DST)[0] = (SRC)[0];             \
+   (DST)[1] = (SRC)[1];             \
+   (DST)[2] = (SRC)[2];             \
+   (DST)[3] = (SRC)[3];             \
+} while (0)
+
+/** Copy a 4-element unsigned byte vector */
+static inline void
+COPY_4UBV(uint8_t dst[4], const uint8_t src[4])
+{
+#if defined(__i386__)
+   *((uint32_t *) dst) = *((uint32_t *) src);
+#else
+   /* The uint32_t cast might fail if DST or SRC are not dword-aligned (RISC) */
+   COPY_4V(dst, src);
+#endif
+}
+
+void reorder_source_3(byte *tex, dword width, dword height, int srcRowStride);
+void *reorder_source_3_alloc(const byte *source, dword width, dword height, int srcRowStride);
+void reorder_source_4(byte *tex, dword width, dword height, int srcRowStride);
+void *reorder_source_4_alloc(const byte *source, dword width, dword height, int srcRowStride);
 
 #endif