Merge branch 'xemu-project:master' into integer-scaling

Author: jyetcv

.github/workflows/build-xemu-win64-toolchain.yml

@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Clone tree
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v4
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v4
       - name: Extract image metadata (tags, labels)
         id: meta
         uses: docker/metadata-action@318604b99e75e41977312d83839a89be02ca4893 # v5

.github/workflows/build.yml

@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Clone tree
-      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v4
+      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v4
       with:
         fetch-depth: 0
     - name: Install dependencies

.github/workflows/bump-subproject-wraps.yml

@@ -14,10 +14,10 @@ jobs:
     name: "Bump Meson subprojects"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v4
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v4
 
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@85856786d1ce8acfbcc2f13a5f3fbd6b938f9f41 # v6
+        uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v6
         with:
           enable-cache: false
 

hw/xbox/nv2a/nv2a_regs.h

@@ -1049,7 +1049,7 @@
 #   define NV097_SET_TEXGEN_Q                                 0x000003CC
 #   define NV097_SET_TEXTURE_MATRIX_ENABLE                    0x00000420
 #   define NV097_SET_POINT_SIZE                               0x0000043C
-#        define NV097_SET_POINT_SIZE_V                            0x000001FF
+#       define NV097_SET_POINT_SIZE_V_MAX                          0x1FF
 #   define NV097_SET_PROJECTION_MATRIX                        0x00000440
 #   define NV097_SET_MODEL_VIEW_MATRIX                        0x00000480
 #   define NV097_SET_INVERSE_MODEL_VIEW_MATRIX                0x00000580

hw/xbox/nv2a/pgraph/glsl/vsh-ff.c

@@ -500,7 +500,8 @@ GLSL_DEFINE(materialEmissionColor, GLSL_LTCTXA(NV_IGRAPH_XF_LTCTXA_CM_COL) ".xyz
                            "  oPts.x = clamp(oPts.x * pointParams[3] + pointParams[7], ptMinSize, ptMaxSize) * %d;\n",
                            state->surface_scale_factor);
     } else {
-        mstring_append_fmt(body, "  oPts.x = %f * %d;\n", state->point_size,
+        mstring_append_fmt(body, "  oPts.x = %f * %d;\n",
+                           MAX(1.f, state->point_size),
                            state->surface_scale_factor);
     }
 }

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

@@ -130,9 +130,7 @@ void pgraph_glsl_set_vsh_state(PGRAPHState *pg, VshState *vsh)
 
     vsh->point_params_enable = GET_MASK(pgraph_reg_r(pg, NV_PGRAPH_CSV0_D),
                                         NV_PGRAPH_CSV0_D_POINTPARAMSENABLE);
-    vsh->point_size = GET_MASK(pgraph_reg_r(pg, NV_PGRAPH_POINTSIZE),
-                               NV097_SET_POINT_SIZE_V) /
-                      8.0f;
+    vsh->point_size = pgraph_reg_r(pg, NV_PGRAPH_POINTSIZE) / 8.0f;
     if (vsh->point_params_enable) {
         for (int i = 0; i < 8; i++) {
             vsh->point_params[i] = pg->point_params[i];
@@ -306,6 +304,12 @@ MString *pgraph_glsl_gen_vsh(const VshState *state, GenVshGlslOptions opts)
         pgraph_glsl_gen_vsh_prog(
             VSH_VERSION_XVS, (uint32_t *)state->programmable.program_data,
             state->programmable.program_length, header, body);
+        if (!state->point_params_enable) {
+            mstring_append_fmt(body, "  oPts.x = %f * %d;\n",
+                               state->point_size <= 0.f ? 1.f :
+                                                          state->point_size,
+                               state->surface_scale_factor);
+        }
     }
 
     if (!state->fog_enable) {

hw/xbox/nv2a/pgraph/pgraph.c

@@ -1729,7 +1729,11 @@ DEF_METHOD_INC(NV097, SET_TEXTURE_MATRIX_ENABLE)
 
 DEF_METHOD(NV097, SET_POINT_SIZE)
 {
-    PG_SET_MASK(NV_PGRAPH_POINTSIZE, NV097_SET_POINT_SIZE_V, parameter);
+    if (parameter > NV097_SET_POINT_SIZE_V_MAX) {
+        return;
+    }
+
+    pgraph_reg_w(pg, NV_PGRAPH_POINTSIZE, parameter);
 }
 
 DEF_METHOD_INC(NV097, SET_PROJECTION_MATRIX)

ui/xemu.desktop

@@ -7,3 +7,4 @@ Name=xemu
 Comment=Emulator for the original Xbox console
 Icon=xemu
 Categories=Game;Emulator;
+Keywords=original;xbox;game;console;emulator;xemu;

xemu.metainfo.xml

@@ -1,48 +1,56 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop-application">
   <id>app.xemu.xemu</id>
-
   <name>xemu</name>
   <summary>Original Xbox Emulator</summary>
-
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-2.0-only</project_license>
-
   <supports>
     <control>pointing</control>
     <control>keyboard</control>
     <control>gamepad</control>
   </supports>
-
   <description>
     <p>
        A free and open-source application that emulates the original Microsoft Xbox game console. Supports connecting up to 4 controllers for local play, networking for multiplayer, resolution scaling, and more.
     </p>
   </description>
-
   <screenshots>
-    <screenshot type="default"><image>https://xemu.app/screenshots/0.png</image></screenshot>
-    <screenshot><image>https://xemu.app/screenshots/1.png</image></screenshot>
-    <screenshot><image>https://xemu.app/screenshots/2.png</image></screenshot>
-    <screenshot><image>https://xemu.app/screenshots/3.png</image></screenshot>
-    <screenshot><image>https://xemu.app/screenshots/4.png</image></screenshot>
-    <screenshot><image>https://xemu.app/screenshots/5.png</image></screenshot>
+    <screenshot type="default">
+      <image>https://xemu.app/screenshots/0.png</image>
+      <caption>"Xbox Dashboard" running in xemu</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://xemu.app/screenshots/1.png</image>
+      <caption>"Halo: Combat Evolved" (Campaign) running in xemu</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://xemu.app/screenshots/2.png</image>
+      <caption>"Fuzion Frenzy" running in xemu</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://xemu.app/screenshots/3.png</image>
+      <caption>"Halo: Combat Evolved" (Multiplayer) running in xemu</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://xemu.app/screenshots/4.png</image>
+      <caption>"Tony Hawk's Pro Skater 2x" running in xemu</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://xemu.app/screenshots/5.png</image>
+      <caption>xemu Settings Menu</caption>
+    </screenshot>
   </screenshots>
-
   <categories>
     <category>Game</category>
     <category>Emulator</category>
   </categories>
-
   <content_rating type="oars-1.1"/>
-
   <url type="homepage">https://xemu.app</url>
   <url type="bugtracker">https://github.com/xemu-project/xemu/issues</url>
   <url type="help">https://xemu.app/docs</url>
   <url type="faq">https://xemu.app/docs/faq</url>
-
   <launchable type="desktop-id">xemu.desktop</launchable>
-
   <provides>
     <binary>xemu</binary>
   </provides>