Changeset 329 for ps

Timestamp:

05/31/04 14:21:14 (21 years ago)

Author:

janwas

Message:

removed endian.* and rolled it into (w)sdl

Location:

ps/trunk/source/lib

Files:

• sdl.h (modified) (1 diff)
• sysdep/win/wsdl.cpp (modified) (6 diffs)
• sysdep/win/wsdl.h (modified) (1 diff)

ps/trunk/source/lib/sdl.h

@@ -4 +4 @@
 # include <SDL/SDL.h>
 # include <SDL/SDL_thread.h>
+# include <SDL/SDL_endian.h>
+    // if the compiler doesn't support inlining, this header will pull
+    // in static bswap routines. doesn't matter - modern compilers
+    // will strip them if unused, and this is more convenient than
+    // another header that toggles between wsdl and SDL_endian.h.
 #endif

ps/trunk/source/lib/sysdep/win/wsdl.cpp

@@ -58 +58 @@
 static u16 mouse_x, mouse_y;
 
+
+static void gamma_swap(bool restore_org);
+
+
 /*
  * shared msg handler
@@ -77 +81 @@
     case WM_ACTIVATE:
         app_active = (wParam & 0xffff) != 0;
+
+        gamma_swap(!app_active);
 
         if(fullscreen)
@@ -374 +380 @@
 static int wsdl_init()
 {
+    // ignore BoundsChecker warnings here. subsystem is set to "Windows"
+    // to avoid the OS opening a console on startup (ugly). that means
+    // stdout isn't associated with a lowio handle; _close ends up
+    // getting called with fd = -1. oh well, nothing we can do.
     FILE* const ret = freopen("stdout.txt", "w", stdout);
     if(!ret)
@@ -489 +499 @@
 
 
+//////////////////////////////////////////////////////////////////////////////
+
+
+static bool gamma_changed;
+static u16 org_ramp[3][256];
+static u16 cur_ramp[3][256];
+
+
 static int calc_gamma_ramp(float gamma, u16* ramp)
 {
@@ -495 +513 @@
 
     // identity
-    // (special-case it to make sure we get the exact value)
+    // (special-case it to make sure we get exact values)
     if(gamma == 1.0f)
     {
@@ -516 +534 @@
 
 
+static void gamma_swap(bool restore_org)
+{
+    if(gamma_changed)
+    {
+        void* ramp = (restore_org)? org_ramp : cur_ramp;
+        SetDeviceGammaRamp(hDC, ramp);
+    }
+}
+
+
 int SDL_SetGamma(float r, float g, float b)
 {
-    u16 ramp[3][256];
-    CHECK_ERR(calc_gamma_ramp(r, ramp[0]));
-    CHECK_ERR(calc_gamma_ramp(g, ramp[1]));
-    CHECK_ERR(calc_gamma_ramp(b, ramp[2]));
-    return SetDeviceGammaRamp(hDC, ramp)? 0 : -1;
-}
-
+    if(!gamma_changed)
+        if(!GetDeviceGammaRamp(hDC, org_ramp))
+            return -1;
+
+    CHECK_ERR(calc_gamma_ramp(r, cur_ramp[0]));
+    CHECK_ERR(calc_gamma_ramp(g, cur_ramp[1]));
+    CHECK_ERR(calc_gamma_ramp(b, cur_ramp[2]));
+
+    if(!SetDeviceGammaRamp(hDC, cur_ramp))
+        return -1;
+
+    gamma_changed = true;
+    return 0;
+}
+
+
+//////////////////////////////////////////////////////////////////////////////
+
+
+// implement only if the header hasn't mapped SDL_Swap* to intrinsics
+
+#ifndef SDL_Swap16
+u16 SDL_Swap16(const u16 x)
+{
+    return (u16)(((x & 0xff) << 8) | (x >> 8));
+}
+#endif
+
+#ifndef SDL_Swap32
+u32 SDL_Swap32(const u32 x)
+{
+    return (x << 24) |
+           (x >> 24) |
+           ((x << 8) & 0x00ff0000) |
+           ((x >> 8) & 0x0000ff00);
+}
+#endif
+
+#ifndef SDL_Swap64
+u64 SDL_Swap64(const u64 x)
+{
+    const u32 lo = (u32)(x & 0xffffffff);
+    const u32 hi = (u32)(x >> 32);
+    u64 ret = SDL_Swap32(lo);
+    ret <<= 32;
+        // careful: must shift var of type u64, not u32
+    ret |= SDL_Swap32(hi);
+    return ret;
+}
+#endif
+
+//////////////////////////////////////////////////////////////////////////////
 
 
 void SDL_Quit()
 {
+    gamma_swap(true);
+
     if(hDC != INVALID_HANDLE_VALUE)
     {

ps/trunk/source/lib/sysdep/win/wsdl.h

@@ -97 +97 @@
 
 
+//////////////////////////////////////////////////////////////////////////////
+
+
+#ifdef linux
+# include <asm/byteorder.h>
+# ifdef __arch__swab16
+#  define SDL_Swap16  __arch__swab16
+# endif
+# ifdef __arch__swab32
+#  define SDL_Swap32  __arch__swab32
+# endif
+#endif
+
+#ifdef _MSC_VER
+# define SDL_Swap16 _byteswap_ushort
+# define SDL_Swap32 _byteswap_ulong
+# define SDL_Swap64 _byteswap_uint64
+#endif
+
+#ifndef SDL_Swap16
+extern u16 SDL_Swap16(u16);
+#endif
+
+#ifndef SDL_Swap32
+extern u32 SDL_Swap32(u32);
+#endif
+
+#ifndef SDL_Swap64
+extern u64 SDL_Swap64(u64);
+#endif
+
+
+//////////////////////////////////////////////////////////////////////////////