RomanRom2/whoa
1
0
Fork 0
mirror of https://github.com/whoahq/whoa.git synced 2026-08-05 00:14:31 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compare commits

base: RomanRom2:0f8ab1d3afa83f82ae0cbfb926d5f35a4b1fbf01
Branches Tags
RomanRom2:master
..
compare: RomanRom2:adb79d1742d52c22152671e614c4e18b03138420
Branches Tags
RomanRom2:master

1 Commits
0f8ab1d3af ... adb79d1742

Author SHA1 Message Date
Tristan 'Natrist' Cormier
adb79d1742
Merge 44bee4cbd7 into 684e293452 2026-07-26 00:50:18 -07:00
3 changed files with 25 additions and 14 deletions
Show Stats Expand all files Collapse all files

10
.github/workflows/pr.yml vendored
View File

@ -1,6 +1,6 @@
name: PR
on: [pull_request]
on: [pull_request_target]
jobs:
build:
@ -45,10 +45,14 @@ jobs:
if: matrix.build.os == 'ubuntu-latest'
- name: Download Fixtures
run: curl -o test/fixture/whoa-fixture.tgz https://whoa.reliquaryhq.com/whoa-fixture.tgz
run: aws s3 cp --endpoint-url ${{ env.AWS_ENDPOINT_URL }} s3://reliquaryhq-whoa/fixture.tgz test/fixture/
env:
AWS_ACCESS_KEY_ID: ${{ secrets.STORAGE_AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.STORAGE_AWS_SECRET_ACCESS_KEY }}
AWS_ENDPOINT_URL: ${{ vars.STORAGE_AWS_ENDPOINT_URL }}
- name: Unpack Fixtures
run: tar -xvzf whoa-fixture.tgz
run: tar -xvzf fixture.tgz
working-directory: test/fixture
- name: Prepare

8
.github/workflows/push.yml vendored
View File

@ -44,10 +44,14 @@ jobs:
submodules: recursive
- name: Download Fixtures
run: curl -o test/fixture/whoa-fixture.tgz https://whoa.reliquaryhq.com/whoa-fixture.tgz
run: aws s3 cp --endpoint-url ${{ env.AWS_ENDPOINT_URL }} s3://reliquaryhq-whoa/fixture.tgz test/fixture/
env:
AWS_ACCESS_KEY_ID: ${{ secrets.STORAGE_AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.STORAGE_AWS_SECRET_ACCESS_KEY }}
AWS_ENDPOINT_URL: ${{ vars.STORAGE_AWS_ENDPOINT_URL }}
- name: Unpack Fixtures
run: tar -xvzf whoa-fixture.tgz
run: tar -xvzf fixture.tgz
working-directory: test/fixture
- name: Prepare

21
src/gx/Blit.cpp
View File

@ -33,8 +33,8 @@ void Blit_uint16_uint16(const C2iVector& size, const void* in, uint32_t inStride
return;
}
auto in_ = static_cast<const char*>(in);
auto out_ = static_cast<char*>(out);
const char* in_ = reinterpret_cast<const char*>(in);
char* out_ = reinterpret_cast<char*>(out);
for (int32_t i = 0; i < size.y; i++) {
memcpy(out_, in_, 2 * size.x);
@ -49,8 +49,8 @@ void Blit_uint32_uint32(const C2iVector& size, const void* in, uint32_t inStride
return;
}
auto in_ = static_cast<const char*>(in);
auto out_ = static_cast<char*>(out);
const char* in_ = reinterpret_cast<const char*>(in);
char* out_ = reinterpret_cast<char*>(out);
for (int32_t i = 0; i < size.y; i++) {
memcpy(out_, in_, 4 * size.x);
@ -180,10 +180,13 @@ void Blit_Dxt1_Rgb565(const C2iVector& size, const void* in, uint32_t inStride,
}
void Blit_Dxt1_Dxt1(const C2iVector& size, const void* in, uint32_t inStride, void* out, uint32_t outStride) {
const char* in_ = static_cast<const char*>(in);
char* out_ = static_cast<char*>(out);
int32_t v6 = std::max(size.x, 4);
int32_t v7 = std::max(size.y, 4);
memcpy(out, in, (4 * v6 * v7) >> 3);
memcpy(out_, in_, (4 * v6 * v7) >> 3);
}
void Blit_Dxt3_Argb8888(const C2iVector& size, const void* in, uint32_t inStride, void* out, uint32_t outStride) {
@ -198,14 +201,14 @@ void Blit_Dxt35_Dxt35(const C2iVector& size, const void* in, uint32_t inStride,
int32_t v5 = std::max(size.x, 4);
int32_t v6 = std::max(size.y / 4, 1);
const char* in_ = static_cast<const char*>(in);
char* out_ = static_cast<char*>(out);
if (inStride == v5 * 4 && outStride == v5 * 4) {
memcpy(out, in, v5 * v6 * 4);
memcpy(out_, in_, v5 * v6 * 4);
return;
}
auto in_ = static_cast<const char*>(in);
auto out_ = static_cast<char*>(out);
for (int32_t i = v6; i > 0; i--) {
memcpy(out_, in_, v5 * 4);
in_ += inStride;