try swapping bytes on textures

diff --git a/openbox/client.c b/openbox/client.c
index 607bd561796d5de99713176e7664fae24199c9c7..82e1f5f6cf3a9b5f08d5902d8a9e3b639f1822bf 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -1348,7 +1348,7 @@ void client_update_icons(Client *self)
                     x = 0;
                     ++y;
                 }
-                self->icons[j].data[t] = (data[i] << 8) | (data[i] >> 24);
+                self->icons[j].data[t] = data[i];
             }
            g_assert(i <= num);
        }

diff --git a/render2/texture.c b/render2/texture.c
index 2508ef7c1340dcfcc217edd34aabc5fbb6b733a1..1b0303ebbf5dbe61df812c29279163d50835d024 100644 (file)
--- a/render2/texture.c
+++ b/render2/texture.c
@@ -64,6 +64,7 @@ void RrTextureSetRGBA(struct RrSurface *sur,
     tex->data.rgba.texid = num;
     glBindTexture(GL_TEXTURE_2D, num);
     glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+    glPixelStorei(GL_PACK_SWAP_BYTES, 1);
     glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
     glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
     glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);