Merge remote-tracking branch 'upstream/preview' into gfx-rdp

Author: rasky

include/rdpq.h

@@ -779,6 +779,7 @@ inline void rdpq_set_tile(rdpq_tile_t tile,
     else {
         assertf(parms->s.shift >= -5 && parms->s.shift <= 10, "invalid s shift %d: must be in [-5..10]", parms->s.shift);
         assertf(parms->t.shift >= -5 && parms->t.shift <= 10, "invalid t shift %d: must be in [-5..10]", parms->t.shift);
+        assertf(parms->palette < 16, "invalid palette %d: must be in [0..15]", parms->palette);
     }
     bool fixup = false;
     bool reuse = false;
@@ -1269,6 +1270,30 @@ inline void rdpq_set_texture_image_raw(uint8_t index, uint32_t offset, tex_forma
         AUTOSYNC_PIPE);
 }
 
+/**
+ * @brief Load a block of memory to TMEM with a single contiguous memory transfer.
+ *
+ * Loads data from RDRAM to TMEM but takes in byte offsets and sizes unlike #rdpq_load_block.
+ *
+ * @param[in] offset    Destination TMEM offset
+ * @param[in] buffer    Pointer to data in RDRAM to load
+ * @param[in] size      Number of bytes to load (max: 4096)
+ *
+ * @see #rdpq_load_block
+ * @see #rdpq_load_block_fx
+ */
+inline void rdpq_load_block_linear(int32_t offset, void *buffer, uint16_t size)
+{
+    assertf((offset & 7) == 0, "invalid TMEM offset %ld: must be 8-byte aligned", offset);
+    assertf((PhysicalAddr(buffer) & 7) == 0, "invalid buffer: %p, must be 8-byte aligned", buffer);
+    assertf((size & 7) == 0, "invalid size %d: must be a multiple of 8", size);
+    assertf(size <= 4096, "invalid size %d: must fit TMEM", size);
+    rdpq_set_texture_image_raw(0, PhysicalAddr(buffer), FMT_RGBA16, 8, size / 8);
+    rdpq_set_tile(RDPQ_TILE_INTERNAL, FMT_RGBA16, offset, 0, NULL);
+    uint32_t num_texels = size / 2;
+    rdpq_load_block(RDPQ_TILE_INTERNAL, 0, 0, num_texels, 16);
+}
+
 /**
  * @brief Store an address into the rdpq lookup table
  * 

src/GL/gl_internal.h

@@ -56,7 +56,6 @@
 #define gl_ensure_no_begin_end() ({ \
     if (state->begin_end_active) { \
         gl_set_error(GL_INVALID_OPERATION, "%s is not allowed between glBegin/glEnd", __func__); \
-        false; \
     } \
     true; \
 })

src/joybus.c

@@ -275,3 +275,5 @@ void joybus_exec( const void * input, void * output )
         }
     }
 }
+
+extern inline void joybus_exec_cmd(int port, size_t send_len, size_t recv_len, const void *send_data, void *recv_data);

src/joypad_accessory.c

@@ -291,15 +291,34 @@ static void joypad_accessory_detect_read_callback(uint64_t *out_dwords, void *ct
     {
         return; // Accessory communication error!
     }
-    else if (state == JOYPAD_ACCESSORY_STATE_DETECT_LABEL_READ)
+    else if (state == JOYPAD_ACCESSORY_STATE_DETECT_CPAK_LABEL_BACKUP)
+    {
+        memcpy((void *)accessory->cpak_label_backup, cmd->recv.data, sizeof(cmd->recv.data));
+        // Step 2C: Overwrite the Controller Pak "label" area
+        for (size_t i = 0; i < sizeof(write_data); ++i) write_data[i] = i;
+        accessory->state = JOYPAD_ACCESSORY_STATE_DETECT_CPAK_LABEL_WRITE;
+        accessory->error = JOYPAD_ACCESSORY_ERROR_PENDING;
+        accessory->retries = 0;
+        joybus_accessory_write_async(
+            port, JOYBUS_ACCESSORY_ADDR_LABEL, write_data,
+            joypad_accessory_detect_write_callback, ctx
+        );
+    }
+    else if (state == JOYPAD_ACCESSORY_STATE_DETECT_CPAK_LABEL_READ)
     {
         // Compare the expected label with what was actually read back
         for (size_t i = 0; i < sizeof(write_data); ++i) write_data[i] = i;
         if (memcmp(cmd->recv.data, write_data, sizeof(write_data)) == 0)
         {
-            // Success: Label write persisted; this appears to be a Controller Pak
-            accessory->state = JOYPAD_ACCESSORY_STATE_IDLE;
-            accessory->type = JOYPAD_ACCESSORY_TYPE_CONTROLLER_PAK;
+            // Step 2E: Restore the Controller Pak "label" area
+            memcpy(write_data, (void *)accessory->cpak_label_backup, sizeof(write_data));
+            accessory->state = JOYPAD_ACCESSORY_STATE_DETECT_CPAK_LABEL_RESTORE;
+            accessory->error = JOYPAD_ACCESSORY_ERROR_PENDING;
+            accessory->retries = 0;
+            joybus_accessory_write_async(
+                port, JOYBUS_ACCESSORY_ADDR_LABEL, write_data,
+                joypad_accessory_detect_write_callback, ctx
+            );
         }
         else
         {
@@ -418,28 +437,44 @@ static void joypad_accessory_detect_write_callback(uint64_t *out_dwords, void *c
     {
         // Transfer Pak has been turned off; reset Transfer Pak status
         accessory->transfer_pak_status.raw = 0x00;
-        // Step 2A: Overwrite "label" area to detect Controller Pak
-        uint8_t data[JOYBUS_ACCESSORY_DATA_SIZE];
-        for (size_t i = 0; i < sizeof(data); ++i) data[i] = i;
-        accessory->state = JOYPAD_ACCESSORY_STATE_DETECT_LABEL_WRITE;
+        // Step 2A: Set Controller Pak "linear paging bank" to 0
+        uint8_t data[JOYBUS_ACCESSORY_DATA_SIZE] = {0};
+        accessory->state = JOYPAD_ACCESSORY_STATE_DETECT_CPAK_BANK_WRITE;
         accessory->error = JOYPAD_ACCESSORY_ERROR_PENDING;
         accessory->retries = 0;
         joybus_accessory_write_async(
-            port, JOYBUS_ACCESSORY_ADDR_LABEL, data,
+            port, JOYPAD_CONTROLLER_PAK_BANK_SWITCH_ADDRESS, data,
             joypad_accessory_detect_write_callback, ctx
         );
     }
-    else if (state == JOYPAD_ACCESSORY_STATE_DETECT_LABEL_WRITE)
+    else if (state == JOYPAD_ACCESSORY_STATE_DETECT_CPAK_BANK_WRITE)
     {
-        // Step 2B: Read back the "label" area to detect Controller Pak
-        accessory->state = JOYPAD_ACCESSORY_STATE_DETECT_LABEL_READ;
+        // Step 2B: Backup the Controller Pak "label" area
+        accessory->state = JOYPAD_ACCESSORY_STATE_DETECT_CPAK_LABEL_BACKUP;
         accessory->error = JOYPAD_ACCESSORY_ERROR_PENDING;
         accessory->retries = 0;
         joybus_accessory_read_async(
             port, JOYBUS_ACCESSORY_ADDR_LABEL,
             joypad_accessory_detect_read_callback, ctx
         );
     }
+    else if (state == JOYPAD_ACCESSORY_STATE_DETECT_CPAK_LABEL_WRITE)
+    {
+        // Step 2D: Read back the "label" area to detect Controller Pak
+        accessory->state = JOYPAD_ACCESSORY_STATE_DETECT_CPAK_LABEL_READ;
+        accessory->error = JOYPAD_ACCESSORY_ERROR_PENDING;
+        accessory->retries = 0;
+        joybus_accessory_read_async(
+            port, JOYBUS_ACCESSORY_ADDR_LABEL,
+            joypad_accessory_detect_read_callback, ctx
+        );
+    }
+    else if (state == JOYPAD_ACCESSORY_STATE_DETECT_CPAK_LABEL_RESTORE)
+    {
+        // Success: Controller Pak detected
+        accessory->state = JOYPAD_ACCESSORY_STATE_IDLE;
+        accessory->type = JOYPAD_ACCESSORY_TYPE_CONTROLLER_PAK;
+    }
     else if (state == JOYPAD_ACCESSORY_STATE_DETECT_RUMBLE_PROBE_WRITE)
     {
         // Step 3B: Read probe value to detect Rumble Pak

src/joypad_accessory.h

@@ -33,8 +33,11 @@ typedef enum
     JOYPAD_ACCESSORY_STATE_IDLE = 0,
     // Accessory detection routine states
     JOYPAD_ACCESSORY_STATE_DETECT_INIT,
-    JOYPAD_ACCESSORY_STATE_DETECT_LABEL_WRITE,
-    JOYPAD_ACCESSORY_STATE_DETECT_LABEL_READ,
+    JOYPAD_ACCESSORY_STATE_DETECT_CPAK_BANK_WRITE,
+    JOYPAD_ACCESSORY_STATE_DETECT_CPAK_LABEL_BACKUP,
+    JOYPAD_ACCESSORY_STATE_DETECT_CPAK_LABEL_WRITE,
+    JOYPAD_ACCESSORY_STATE_DETECT_CPAK_LABEL_READ,
+    JOYPAD_ACCESSORY_STATE_DETECT_CPAK_LABEL_RESTORE,
     JOYPAD_ACCESSORY_STATE_DETECT_RUMBLE_PROBE_WRITE,
     JOYPAD_ACCESSORY_STATE_DETECT_RUMBLE_PROBE_READ,
     JOYPAD_ACCESSORY_STATE_DETECT_TRANSFER_PROBE_ON,
@@ -138,6 +141,7 @@ typedef struct joypad_accessory_s
     joypad_accessory_state_t state;
     joypad_accessory_error_t error;
     unsigned retries;
+    uint8_t cpak_label_backup[JOYBUS_ACCESSORY_DATA_SIZE];
     joypad_accessory_io_t io;
     timer_link_t *transfer_pak_wait_timer;
     joybus_transfer_pak_status_t transfer_pak_status;
@@ -155,8 +159,11 @@ void joypad_accessory_reset(joypad_port_t port);
  * @brief Detect which accessory is inserted in an N64 controller.
  *
  * * Step 1: Ensure Transfer Pak is turned off
- * * Step 2A: Overwrite "label" area to detect Controller Pak
- * * Step 2B: Read back the "label" area to detect Controller Pak
+ * * Step 2A: Set Controller Pak "linear paging bank" to 0
+ * * Step 2B: Backup the Controller Pak "label" area
+ * * Step 2C: Overwrite the Controller Pak "label" area
+ * * Step 2D: Read back the "label" area to detect Controller Pak
+ * * Step 2E: Restore the Controller Pak "label" area
  * * Step 3A: Write probe value to detect Rumble Pak
  * * Step 3B: Read probe value to detect Rumble Pak
  * * Step 4A: Write probe value to detect Transfer Pak

src/rdpq/rdpq.c

@@ -1182,6 +1182,7 @@ extern inline void rdpq_load_tlut_raw(rdpq_tile_t tile, int first_color, int num
 extern inline void rdpq_set_tile_size_fx(rdpq_tile_t tile, uint16_t s0, uint16_t t0, uint16_t s1, uint16_t t1);
 extern inline void rdpq_load_block(rdpq_tile_t tile, uint16_t s0, uint16_t t0, uint16_t num_texels, uint16_t tmem_pitch);
 extern inline void rdpq_load_block_fx(rdpq_tile_t tile, uint16_t s0, uint16_t t0, uint16_t num_texels, uint16_t dxt);
+extern inline void rdpq_load_block_linear(int32_t offset, void *buffer, uint16_t size);
 extern inline void rdpq_load_tile_fx(rdpq_tile_t tile, uint16_t s0, uint16_t t0, uint16_t s1, uint16_t t1);
 extern inline void rdpq_set_combiner_raw(uint64_t cc);
 extern inline void rdpq_set_other_modes_raw(uint64_t mode);
@@ -1192,3 +1193,4 @@ extern inline void rdpq_set_texture_image_raw(uint8_t index, uint32_t offset, te
 extern inline void rdpq_set_lookup_address(uint8_t index, void* rdram_addr);
 extern inline void rdpq_set_tile(rdpq_tile_t tile, tex_format_t format, int32_t tmem_addr, uint16_t tmem_pitch, const rdpq_tileparms_t *parms);
 extern inline void rdpq_call_deferred(void (*func)(void *), void *arg);
+extern inline void rdpq_set_yuv_parms(uint16_t k0, uint16_t k1, uint16_t k2, uint16_t k3, uint16_t k4, uint16_t k5);

src/vi.c

@@ -741,4 +741,5 @@ void vi_init(void)
 }
 
 extern inline int vi_get_scanline(int *field);
+extern inline void vi_write(volatile uint32_t *reg, uint32_t value);
 extern inline uint32_t vi_read(volatile uint32_t *reg);

tools/build-gdb.sh

@@ -46,12 +46,16 @@ command_exists () {
 
 # Download the file URL using wget or curl (depending on which is installed)
 download () {
-    if   command_exists wget ; then (cd "$DOWNLOAD_PATH" && wget -c  "$1")
-    elif command_exists curl ; then (cd "$DOWNLOAD_PATH" && curl -LO "$1")
+    local url="$1"
+    local file="$DOWNLOAD_PATH/$(basename "$url")"
+    local tmpfile="$file.part"
+    if   command_exists wget ; then wget --continue --output-document "$tmpfile" "$url"
+    elif command_exists curl ; then curl --location --output "$tmpfile" "$url"
     else
         echo "Install wget or curl to download toolchain sources" 1>&2
         return 1
     fi
+    mv "$tmpfile" "$file"
 }
 
 # Dependency downloads and unpack

tools/build-toolchain.sh

@@ -59,12 +59,16 @@ command_exists () {
 
 # Download the file URL using wget or curl (depending on which is installed)
 download () {
-    if   command_exists wget ; then (cd "$DOWNLOAD_PATH" && wget -c  "$1")
-    elif command_exists curl ; then (cd "$DOWNLOAD_PATH" && curl -LO "$1")
+    local url="$1"
+    local file="$DOWNLOAD_PATH/$(basename "$url")"
+    local tmpfile="$file.part"
+    if   command_exists wget ; then wget --continue --output-document "$tmpfile" "$url"
+    elif command_exists curl ; then curl --location --output "$tmpfile" "$url"
     else
         echo "Install wget or curl to download toolchain sources" 1>&2
         return 1
     fi
+    mv "$tmpfile" "$file"
 }
 
 # Compilation on macOS via homebrew
@@ -220,7 +224,7 @@ pushd gcc_compile_target
     --with-newlib \
     --disable-win32-registry \
     --disable-nls \
-    --disable-werror 
+    --disable-werror
 make all-gcc -j "$JOBS"
 make install-gcc || sudo make install-gcc || su -c "make install-gcc"
 make all-target-libgcc -j "$JOBS"