From bb0fdef251b25b9fadd9fc7076544673d1114953 Mon Sep 17 00:00:00 2001
From: Matt Borgerson <contact@mborgerson.com>
Date: Sat, 5 Sep 2020 15:34:43 -0700
Subject: [PATCH] nv2a: Handle alignment padding between cubemap faces

---
 hw/xbox/nv2a/nv2a_pgraph.c | 19 +++++++++++++++++--
 hw/xbox/nv2a/nv2a_regs.h   |  2 ++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/hw/xbox/nv2a/nv2a_pgraph.c b/hw/xbox/nv2a/nv2a_pgraph.c
index 3a58338915..185bafacd9 100644
--- a/hw/xbox/nv2a/nv2a_pgraph.c
+++ b/hw/xbox/nv2a/nv2a_pgraph.c
@@ -3822,6 +3822,7 @@ static void pgraph_bind_textures(NV2AState *d)
                 }
                 if (cubemap) {
                     assert(dimensionality == 2);
+                    length = (length + NV2A_CUBEMAP_FACE_ALIGNMENT - 1) & ~(NV2A_CUBEMAP_FACE_ALIGNMENT - 1);
                     length *= 6;
                 }
                 if (dimensionality >= 3) {
@@ -4414,16 +4415,30 @@ static TextureBinding* generate_texture(const TextureShape s,
 
     if (gl_target == GL_TEXTURE_CUBE_MAP) {
 
+        ColorFormatInfo f = kelvin_color_format_map[s.color_format];
+        unsigned int block_size;
+        if (f.gl_internal_format == GL_COMPRESSED_RGBA_S3TC_DXT1_EXT) {
+            block_size = 8;
+        } else {
+            block_size = 16;
+        }
+
         size_t length = 0;
         unsigned int w = s.width, h = s.height;
         int level;
         for (level = 0; level < s.levels; level++) {
-            /* FIXME: This is wrong for compressed textures and textures with 1x? non-square mipmaps */
-            length += w * h * f.bytes_per_pixel;
+            if (f.gl_format == 0) {
+                length += w/4 * h/4 * block_size;
+            } else {
+                length += w * h * f.bytes_per_pixel;
+            }
+
             w /= 2;
             h /= 2;
         }
 
+        length = (length + NV2A_CUBEMAP_FACE_ALIGNMENT - 1) & ~(NV2A_CUBEMAP_FACE_ALIGNMENT - 1);
+
         upload_gl_texture(GL_TEXTURE_CUBE_MAP_POSITIVE_X,
                           s, texture_data + 0 * length, palette_data);
         upload_gl_texture(GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
diff --git a/hw/xbox/nv2a/nv2a_regs.h b/hw/xbox/nv2a/nv2a_regs.h
index a689b14246..7743f5ba05 100644
--- a/hw/xbox/nv2a/nv2a_regs.h
+++ b/hw/xbox/nv2a/nv2a_regs.h
@@ -1337,4 +1337,6 @@
 #define NV2A_LTCTXB_COUNT  52
 #define NV2A_LTC1_COUNT    20
 
+#define NV2A_CUBEMAP_FACE_ALIGNMENT 128
+
 #endif