X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=quakedef.h;h=2310bc2062e0143336e2c0b1e60de3583d2e96f0;hb=2000fe0dea529231a494c63436f171829cbf43e5;hp=03b87f732719fa62b17ced0ffad16110f0286a6d;hpb=0675986e0c28e85906a0c9196b3e9aae9bfb3f34;p=xonotic%2Fdarkplaces.git

diff --git a/quakedef.h b/quakedef.h
index 03b87f73..2310bc20 100644
--- a/quakedef.h
+++ b/quakedef.h
@@ -86,7 +86,7 @@ extern char engineversion[128];
 #define MAX_NETWM_ICON 1026 // one 32x32
 
 #define	MAX_WATERPLANES			2
-#define	MAX_CUBEMAPS			64
+#define	MAX_CUBEMAPS			1024
 #define	MAX_EXPLOSIONS			8
 #define	MAX_DLIGHTS				16
 #define	MAX_CACHED_PICS			1024 // this is 144 bytes each (or 152 on 64bit)
@@ -153,7 +153,7 @@ extern char engineversion[128];
 #define MAX_NETWM_ICON 352822 // 16x16, 22x22, 24x24, 32x32, 48x48, 64x64, 128x128, 256x256, 512x512
 
 #define	MAX_WATERPLANES			16 ///< max number of water planes visible (each one causes additional view renders)
-#define	MAX_CUBEMAPS			256 ///< max number of cubemap textures loaded for light filters
+#define	MAX_CUBEMAPS			1024 ///< max number of cubemap textures loaded for light filters
 #define	MAX_EXPLOSIONS			64 ///< max number of explosion shell effects active at once (not particle related)
 #define	MAX_DLIGHTS				256 ///< max number of dynamic lights (rocket flashes, etc) in scene at once
 #define	MAX_CACHED_PICS			1024 ///< max number of 2D pics loaded at once
@@ -229,6 +229,7 @@ extern char engineversion[128];
 //#define STAT_TIME			17 ///< FTE
 //#define STAT_VIEW2		20 ///< FTE
 #define STAT_VIEWZOOM		21 ///< DP
+#define STAT_MOVEVARS_AIRACCEL_QW_STRETCHFACTOR 220 ///< DP
 #define STAT_MOVEVARS_AIRCONTROL_PENALTY					221 ///< DP
 #define STAT_MOVEVARS_AIRSPEEDLIMIT_NONQW 222 ///< DP
 #define STAT_MOVEVARS_AIRSTRAFEACCEL_QW 223 ///< DP
@@ -429,6 +430,10 @@ extern cvar_t developer_loading;
 #elif defined(__OpenBSD__)
 # define DP_OS_NAME		"OpenBSD"
 # define DP_OS_STR		"openbsd"
+#elif defined(TARGET_OS_IPHONE)
+# define DP_OS_NAME		"iPhoneOS"
+# define DP_OS_STR		"iphoneos"
+# define USE_GLES2		1
 #elif defined(MACOSX)
 # define DP_OS_NAME		"Mac OS X"
 # define DP_OS_STR		"osx"
@@ -437,6 +442,7 @@ extern cvar_t developer_loading;
 # define DP_OS_STR		"morphos"
 #else
 # define DP_OS_NAME		"Unknown"
+# define DP_OS_STR		"unknown"
 #endif
 
 #if defined(__GNUC__)
@@ -475,10 +481,16 @@ extern cvar_t developer_loading;
 # undef SSE2_PRESENT
 #endif
 
-// for x86 cpus only...  (x64 has SSE2_PRESENT)
-#if defined(SSE_POSSIBLE) && !defined(SSE2_PRESENT)
+#ifdef SSE2_PRESENT
+#define Sys_HaveSSE() true
+#define Sys_HaveSSE2() true
+#elif defined(SSE_POSSIBLE)
+// runtime detection of SSE/SSE2 capabilities for x86
 qboolean Sys_HaveSSE(void);
 qboolean Sys_HaveSSE2(void);
+#else
+#define Sys_HaveSSE() false
+#define Sys_HaveSSE2() false
 #endif
 
 /// incremented every frame, never reset