Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/preview' into gfx-rdp
Browse files Browse the repository at this point in the history
  • Loading branch information
rasky committed May 17, 2024
2 parents e497a64 + 2a406d4 commit 74369a0
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-toolchain-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ jobs:
# required for newlib (as not the default?!)
export PATH="$PATH:${{ runner.temp }}/${{ env.Build_Directory }}"
cd ./tools/
sudo N64_INST=${{ runner.temp }}/${{ env.Build_Directory }} N64_HOST=${{ matrix.host }} MAKE_V=${{ matrix.makefile-version }} ./build-toolchain.sh
N64_INST=${{ runner.temp }}/${{ env.Build_Directory }} N64_HOST=${{ matrix.host }} MAKE_V=${{ matrix.makefile-version }} ./build-toolchain.sh
echo Remove un-necessary content
rm -rf ${N64_INST}/share/locale/*
Expand Down
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ RUN apt-get install -yq \
libmpc-dev \
zlib1g-dev \
texinfo \
git \
gcc-multilib
git

# Build toolchain
COPY ./tools/build-toolchain.sh /tmp/tools/build-toolchain.sh
Expand Down
2 changes: 2 additions & 0 deletions src/audio/libdragon.mk
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@ LIBDRAGON_OBJS += \
$(BUILD_DIR)/audio/rsp_opus_fft_bfly4.o \
$(BUILD_DIR)/audio/rsp_opus_fft_bfly5.o \
$(BUILD_DIR)/audio/rsp_opus_fft_postrot.o

$(BUILD_DIR)/audio/libopus.o: CFLAGS+=-Wno-all
2 changes: 1 addition & 1 deletion src/audio/wav64_opus.c
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ static void waveform_opus_read(void *ctx, samplebuffer_t *sbuf, int wpos, int wl

// Allocate stack buffer for reading compressed data. Align it to cacheline
// to avoid any false sharing.
uint8_t buf[st->xhead.max_cmp_frame_size] alignas(16);
uint8_t alignas(16) buf[st->xhead.max_cmp_frame_size];
int nframes = DIVIDE_CEIL(wlen, st->xhead.frame_size);

// Make space for the decoded samples. Call samplebuffer_append once as we
Expand Down
5 changes: 3 additions & 2 deletions tools/audioconv64/libopus.c
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@

#pragma GCC diagnostic push

// Compiling libopus seems to trigger this warning that we can safely ignore.
// Compiling libopus seems to trigger these warnings that we can safely ignore.
#pragma GCC diagnostic ignored "-Wtautological-pointer-compare"
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"

// Activate support for CELT custom modes. We are going to always use the
// custom mode API even for standard modes (like 48 Khz), so we can safely
Expand Down Expand Up @@ -38,4 +39,4 @@

#pragma GCC diagnostic pop
#undef MIN
#undef MAX
#undef MAX
2 changes: 1 addition & 1 deletion tools/build-toolchain.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/bash
# N64 MIPS GCC toolchain build/install script for Unix distributions
# (c) 2012-2023 DragonMinded and libDragon Contributors.
# (c) 2012-2024 DragonMinded and libDragon Contributors.
# See the root folder for license information.

# Bash strict mode http://redsymbol.net/articles/unofficial-bash-strict-mode/
Expand Down

0 comments on commit 74369a0

Please sign in to comment.