Merge branch 'master' into xblc_gui

build.sh

@@ -196,7 +196,7 @@ case "$platform" in # Adjust compilation options based on platform
     Darwin)
         echo "Compiling for MacOS for $target_arch..."
         if [ "$target_arch" == "arm64" ]; then
-            macos_min_ver=12.7.5
+            macos_min_ver=13.7.4
         elif [ "$target_arch" == "x86_64" ]; then
             macos_min_ver=12.7.5
         else

debian/control

@@ -7,6 +7,7 @@ Build-Depends: debhelper (>= 11),
  git,
  python3:any,
  python3-yaml,
+ python3-venv,
  ninja-build,
  libgtk-3-dev,
  libepoxy-dev,

hw/xbox/nv2a/pgraph/gl/draw.c

@@ -332,13 +332,12 @@ void pgraph_gl_draw_begin(NV2AState *d)
 
     /* Surface clip */
     /* FIXME: Consider moving to PSH w/ window clip */
-    unsigned int xmin = pg->surface_shape.clip_x - pg->surface_binding_dim.clip_x,
+    unsigned int xmin = pg->surface_shape.clip_x,
-                 ymin = pg->surface_shape.clip_y - pg->surface_binding_dim.clip_y;
+                 ymin = pg->surface_shape.clip_y;
-    unsigned int xmax = xmin + pg->surface_shape.clip_width - 1,
+
-                 ymax = ymin + pg->surface_shape.clip_height - 1;
+    unsigned int scissor_width = pg->surface_shape.clip_width,
+                 scissor_height = pg->surface_shape.clip_height;
 
-    unsigned int scissor_width = xmax - xmin + 1,
-                 scissor_height = ymax - ymin + 1;
     pgraph_apply_anti_aliasing_factor(pg, &xmin, &ymin);
     pgraph_apply_anti_aliasing_factor(pg, &scissor_width, &scissor_height);
     ymin = pg->surface_binding_dim.height - (ymin + scissor_height);

hw/xbox/nv2a/pgraph/gl/surface.c

@@ -582,9 +582,7 @@ static bool check_surface_compatibility(SurfaceBinding *s1, SurfaceBinding *s2,
         (s1->color == s2->color) &&
         (s1->fmt.gl_attachment == s2->fmt.gl_attachment) &&
         (s1->fmt.gl_internal_format == s2->fmt.gl_internal_format) &&
-        (s1->pitch == s2->pitch) &&
+        (s1->pitch == s2->pitch);
-        (s1->shape.clip_x <= s2->shape.clip_x) &&
-        (s1->shape.clip_y <= s2->shape.clip_y);
     if (!format_compatible) {
         return false;
     }

hw/xbox/nv2a/pgraph/glsl/psh.c

@@ -984,8 +984,8 @@ static MString* psh_convert(struct PixelShader *ps)
             }
             break;
         case PS_TEXTUREMODES_CUBEMAP:
-            mstring_append_fmt(vars, "vec4 t%d = texture(texSamp%d, pT%d.xyz / pT%d.w);\n",
+            mstring_append_fmt(vars, "vec4 t%d = texture(texSamp%d, pT%d.xyz);\n",
-                               i, i, i, i);
+                               i, i, i);
             break;
         case PS_TEXTUREMODES_PASSTHRU:
             assert(ps->state.border_logical_size[i][0] == 0.0f && "Unexpected border texture on passthru");

hw/xbox/nv2a/pgraph/vk/draw.c

@@ -1472,16 +1472,11 @@ static void begin_draw(PGRAPHState *pg)
 
         /* Surface clip */
         /* FIXME: Consider moving to PSH w/ window clip */
-        unsigned int xmin = pg->surface_shape.clip_x -
+        unsigned int xmin = pg->surface_shape.clip_x,
-                            pg->surface_binding_dim.clip_x,
+                     ymin = pg->surface_shape.clip_y;
-                     ymin = pg->surface_shape.clip_y -
-                            pg->surface_binding_dim.clip_y;
 
-        unsigned int xmax = xmin + pg->surface_shape.clip_width - 1,
+        unsigned int scissor_width = pg->surface_shape.clip_width,
-                     ymax = ymin + pg->surface_shape.clip_height - 1;
+                     scissor_height = pg->surface_shape.clip_height;
-
-        unsigned int scissor_width = xmax - xmin + 1,
-                     scissor_height = ymax - ymin + 1;
 
         pgraph_apply_anti_aliasing_factor(pg, &xmin, &ymin);
         pgraph_apply_anti_aliasing_factor(pg, &scissor_width, &scissor_height);

hw/xbox/nv2a/pgraph/vk/surface.c

@@ -890,9 +890,7 @@ static bool check_surface_compatibility(SurfaceBinding const *s1,
     bool format_compatible =
         (s1->color == s2->color) &&
         (s1->host_fmt.vk_format == s2->host_fmt.vk_format) &&
-        (s1->pitch == s2->pitch) &&
+        (s1->pitch == s2->pitch);
-        (s1->shape.clip_x <= s2->shape.clip_x) &&
-        (s1->shape.clip_y <= s2->shape.clip_y);
     if (!format_compatible) {
         return false;
     }

scripts/download-macos-libs.py

@@ -10,8 +10,7 @@ import os.path
 from tarfile import TarFile
 import subprocess
 
-# MIRROR = 'http://packages.macports.org/macports/packages'
+MIRROR = 'https://packages.macports.org'
-MIRROR = 'http://nue.de.packages.macports.org/macports/packages'
 
 # FIXME: Inline macports key
 # FIXME: Move packages to archive directory to track used vs unused
@@ -19,7 +18,7 @@ MIRROR = 'http://nue.de.packages.macports.org/macports/packages'
 
 class LibInstaller:
 	DARWIN_TARGET_X64="darwin_17" # macOS 10.13
-	DARWIN_TARGET_ARM64="darwin_21" # macOS 12.x
+	DARWIN_TARGET_ARM64="darwin_22" # macOS 13.x
 
 	def __init__(self, arch):
 		self._queue = []