code_block, voodoo_t *voodoo, voodoo_params_t *params, voodoo_state_t *state, int block_pos, int tmu) + { + if (params->textureMode[tmu] & 1) +@@ -674,10 +692,10 @@ static inline void voodoo_generate(uint8_t *code_block + // xmm_01_w = (__m128i)0x0001000100010001ull; + // xmm_ff_w = (__m128i)0x00ff00ff00ff00ffull; + // xmm_ff_b = (__m128i)0x00000000ffffffffull; +- xmm_01_w = _mm_set_epi32(0, 0, 0x00010001, 0x00010001); +- xmm_ff_w = _mm_set_epi32(0, 0, 0x00ff00ff, 0x00ff00ff); +- xmm_ff_b = _mm_set_epi32(0, 0, 0, 0x00ffffff); +- minus_254 = _mm_set_epi32(0, 0, 0xff02ff02, 0xff02ff02); ++ xmm_01_w = voodoo_set_epi32_u32(0, 0, 0x00010001u, 0x00010001u); ++ xmm_ff_w = voodoo_set_epi32_u32(0, 0, 0x00ff00ffu, 0x00ff00ffu); ++ xmm_ff_b = voodoo_set_epi32_u32(0, 0, 0, 0x00ffffffu); ++ minus_254 = voodoo_set_epi32_u32(0, 0, 0xff02ff02u, 0xff02ff02u); + // *(uint64_t *)&const_1_48 = 0x45b0000000000000ull; + // block_pos = 0; + // voodoo_get_depth = &code_block[block_pos]; +@@ -3386,20 +3404,20 @@ void voodoo_codegen_init(voodoo_t *voodoo) + int _ds = c & 0xf; + int dt = c >> 4; + +- alookup[c] = _mm_set_epi32(0, 0, c | (c << 16), c | (c << 16)); +- aminuslookup[c] = _mm_set_epi32(0, 0, (255-c) | ((255-c) << 16), (255-c) | ((255-c) << 16)); ++ alookup[c] = voodoo_set_epi32_u32(0, 0, static_cast(c | (c << 16)), static_cast(c | (c << 16))); ++ aminuslookup[c] = voodoo_set_epi32_u32(0, 0, static_cast((255-c) | ((255-c) << 16)), static_cast((255-c) | ((255-c) << 16))); + + d[0] = (16 - _ds) * (16 - dt); + d[1] = _ds * (16 - dt); + d[2] = (16 - _ds) * dt; + d[3] = _ds * dt; + +- bilinear_lookup[c*2] = _mm_set_epi32(d[1] | (d[1] << 16), d[1] | (d[1] << 16), d[0] | (d[0] << 16), d[0] | (d[0] << 16)); +- bilinear_lookup[c*2 + 1] = _mm_set_epi32(d[3] | (d[3] << 16), d[3] | (d[3] << 16), d[2] | (d[2] << 16), d[2] | (d[2] << 16)); ++ bilinear_lookup[c*2] = voodoo_set_epi32_u32(static_cast(d[1] | (d[1] << 16)), static_cast(d[1] | (d[1] << 16)), static_cast(d[0] | (d[0] << 16)), static_cast(d[0] | (d[0] << 16))); ++ bilinear_lookup[c*2 + 1] = voodoo_set_epi32_u32(static_cast(d[3] | (d[3] << 16)), static_cast(d[3] | (d[3] << 16)), static_cast(d[2] | (d[2] << 16)), static_cast(d[2] | (d[2] << 16))); + } +- alookup[256] = _mm_set_epi32(0, 0, 256 | (256 << 16), 256 | (256 << 16)); +- xmm_00_ff_w[0] = _mm_set_epi32(0, 0, 0, 0); +- xmm_00_ff_w[1] = _mm_set_epi32(0, 0, 0xff | (0xff << 16), 0xff | (0xff << 16)); ++ alookup[256] = voodoo_set_epi32_u32(0, 0, 256u | (256u << 16), 256u | (256u << 16)); ++ xmm_00_ff_w[0] = voodoo_set_epi32_u32(0, 0, 0, 0); ++ xmm_00_ff_w[1] = voodoo_set_epi32_u32(0, 0, 0xffu | (0xffu << 16), 0xffu | (0xffu << 16)); + } + + void voodoo_codegen_close(voodoo_t *voodoo) diff --git a/emulators/amiberry/pkg-plist b/emulators/amiberry/pkg-plist index c4c9adabb352..53c6e3b1b224 100644 --- a/emulators/amiberry/pkg-plist +++ b/emulators/amiberry/pkg-plist @@ -3,115 +3,15 @@ lib/amiberry/libcapsimage.so lib/amiberry/libfloppybridge.so %%DATADIR%%/controllers/gamecontrollerdb.txt %%DATADIR%%/controllers/gamecontrollerdb_user.txt -%%DATADIR%%/data/35floppy.png -%%DATADIR%%/data/AmigaTopaz.ttf %%DATADIR%%/data/abr/brainfile.xml %%DATADIR%%/data/abr/catlist.xml -%%DATADIR%%/data/amiberry-logo.png -%%DATADIR%%/data/amiberry.png -%%DATADIR%%/data/amiberry.svg -%%DATADIR%%/data/amigainfo.png -%%DATADIR%%/data/axis.png -%%DATADIR%%/data/button.png -%%DATADIR%%/data/chip.png -%%DATADIR%%/data/controller.png -%%DATADIR%%/data/controllermap.png -%%DATADIR%%/data/controllermap_back.png -%%DATADIR%%/data/cpu.png -%%DATADIR%%/data/cursor.bmp -%%DATADIR%%/data/delete.png -%%DATADIR%%/data/drive.png -%%DATADIR%%/data/expansion.png -%%DATADIR%%/data/file.png -%%DATADIR%%/data/fixedfont.png +%%DATADIR%%/data/amiberry.ico %%DATADIR%%/data/floppy_sounds/drive_click.wav %%DATADIR%%/data/floppy_sounds/drive_snatch.wav %%DATADIR%%/data/floppy_sounds/drive_spin.wav %%DATADIR%%/data/floppy_sounds/drive_spinnd.wav %%DATADIR%%/data/floppy_sounds/drive_startup.wav %%DATADIR%%/data/icon.icns -%%DATADIR%%/data/joystick.png -%%DATADIR%%/data/keyboard.png -%%DATADIR%%/data/misc.png -%%DATADIR%%/data/paths.png -%%DATADIR%%/data/port.png -%%DATADIR%%/data/quickstart.png -%%DATADIR%%/data/rpgfont.png -%%DATADIR%%/data/savestate.png -%%DATADIR%%/data/screen.png -%%DATADIR%%/data/sound.png -%%DATADIR%%/data/vkbd/vkbdCoolFRLarge.png -%%DATADIR%%/data/vkbd/vkbdCoolFRLargeHires.png -%%DATADIR%%/data/vkbd/vkbdCoolFRLargeShift.png -%%DATADIR%%/data/vkbd/vkbdCoolFRLargeShiftHires.png -%%DATADIR%%/data/vkbd/vkbdCoolGerLarge.png -%%DATADIR%%/data/vkbd/vkbdCoolGerLargeHires.png -%%DATADIR%%/data/vkbd/vkbdCoolGerLargeShift.png -%%DATADIR%%/data/vkbd/vkbdCoolGerLargeShiftHires.png -%%DATADIR%%/data/vkbd/vkbdCoolQuit.png -%%DATADIR%%/data/vkbd/vkbdCoolQuitHires.png -%%DATADIR%%/data/vkbd/vkbdCoolUKLarge.png -%%DATADIR%%/data/vkbd/vkbdCoolUKLargeHires.png -%%DATADIR%%/data/vkbd/vkbdCoolUKLargeShift.png -%%DATADIR%%/data/vkbd/vkbdCoolUKLargeShiftHires.png -%%DATADIR%%/data/vkbd/vkbdCoolUSLarge.png -%%DATADIR%%/data/vkbd/vkbdCoolUSLargeHires.png -%%DATADIR%%/data/vkbd/vkbdCoolUSLargeShift.png -%%DATADIR%%/data/vkbd/vkbdCoolUSLargeShiftHires.png -%%DATADIR%%/data/vkbd/vkbdDarkFRLarge.png -%%DATADIR%%/data/vkbd/vkbdDarkFRLargeHires.png -%%DATADIR%%/data/vkbd/vkbdDarkFRLargeShift.png -%%DATADIR%%/data/vkbd/vkbdDarkFRLargeShiftHires.png -%%DATADIR%%/data/vkbd/vkbdDarkGerLarge.png -%%DATADIR%%/data/vkbd/vkbdDarkGerLargeHires.png -%%DATADIR%%/data/vkbd/vkbdDarkGerLargeShift.png -%%DATADIR%%/data/vkbd/vkbdDarkGerLargeShiftHires.png -%%DATADIR%%/data/vkbd/vkbdDarkQuit.png -%%DATADIR%%/data/vkbd/vkbdDarkQuitHires.png -%%DATADIR%%/data/vkbd/vkbdDarkUKLarge.png -%%DATADIR%%/data/vkbd/vkbdDarkUKLargeHires.png -%%DATADIR%%/data/vkbd/vkbdDarkUKLargeShift.png -%%DATADIR%%/data/vkbd/vkbdDarkUKLargeShiftHires.png -%%DATADIR%%/data/vkbd/vkbdDarkUSLarge.png -%%DATADIR%%/data/vkbd/vkbdDarkUSLargeHires.png -%%DATADIR%%/data/vkbd/vkbdDarkUSLargeShift.png -%%DATADIR%%/data/vkbd/vkbdDarkUSLargeShiftHires.png -%%DATADIR%%/data/vkbd/vkbdOrigFRLarge.png -%%DATADIR%%/data/vkbd/vkbdOrigFRLargeHires.png -%%DATADIR%%/data/vkbd/vkbdOrigFRLargeShift.png -%%DATADIR%%/data/vkbd/vkbdOrigFRLargeShiftHires.png -%%DATADIR%%/data/vkbd/vkbdOrigGerLarge.png -%%DATADIR%%/data/vkbd/vkbdOrigGerLargeHires.png -%%DATADIR%%/data/vkbd/vkbdOrigGerLargeShift.png -%%DATADIR%%/data/vkbd/vkbdOrigGerLargeShiftHires.png -%%DATADIR%%/data/vkbd/vkbdOrigQuit.png -%%DATADIR%%/data/vkbd/vkbdOrigQuitHires.png -%%DATADIR%%/data/vkbd/vkbdOrigUKLarge.png -%%DATADIR%%/data/vkbd/vkbdOrigUKLargeHires.png -%%DATADIR%%/data/vkbd/vkbdOrigUKLargeShift.png -%%DATADIR%%/data/vkbd/vkbdOrigUKLargeShiftHires.png -%%DATADIR%%/data/vkbd/vkbdOrigUSLarge.png -%%DATADIR%%/data/vkbd/vkbdOrigUSLargeHires.png -%%DATADIR%%/data/vkbd/vkbdOrigUSLargeShift.png -%%DATADIR%%/data/vkbd/vkbdOrigUSLargeShiftHires.png -%%DATADIR%%/data/vkbd/vkbdWarmFRLarge.png -%%DATADIR%%/data/vkbd/vkbdWarmFRLargeHires.png -%%DATADIR%%/data/vkbd/vkbdWarmFRLargeShift.png -%%DATADIR%%/data/vkbd/vkbdWarmFRLargeShiftHires.png -%%DATADIR%%/data/vkbd/vkbdWarmGerLarge.png -%%DATADIR%%/data/vkbd/vkbdWarmGerLargeHires.png -%%DATADIR%%/data/vkbd/vkbdWarmGerLargeShift.png -%%DATADIR%%/data/vkbd/vkbdWarmGerLargeShiftHires.png -%%DATADIR%%/data/vkbd/vkbdWarmQuit.png -%%DATADIR%%/data/vkbd/vkbdWarmQuitHires.png -%%DATADIR%%/data/vkbd/vkbdWarmUKLarge.png -%%DATADIR%%/data/vkbd/vkbdWarmUKLargeHires.png -%%DATADIR%%/data/vkbd/vkbdWarmUKLargeShift.png -%%DATADIR%%/data/vkbd/vkbdWarmUKLargeShiftHires.png -%%DATADIR%%/data/vkbd/vkbdWarmUSLarge.png -%%DATADIR%%/data/vkbd/vkbdWarmUSLargeHires.png -%%DATADIR%%/data/vkbd/vkbdWarmUSLargeShift.png -%%DATADIR%%/data/vkbd/vkbdWarmUSLargeShiftHires.png %%DATADIR%%/roms/aros-ext.bin %%DATADIR%%/roms/aros-rom.bin %%DATADIR%%/roms/mt32-roms/dir.txt @@ -131,9 +31,12 @@ lib/amiberry/libfloppybridge.so %%DATADIR%%/whdboot/save-data/Kickstarts/kick40068.A4000.RTB %%DATADIR%%/whdboot/save-data/Savegames/foo.txt share/applications/Amiberry.desktop -%%DOCS%%%%DOCSDIR%%/changelog.gz -%%DOCS%%%%DOCSDIR%%/copyright -share/icons/hicolor/scalable/apps/amiberry.svg +%%PORTDOCS%%%%DOCSDIR%%/changelog.gz +%%PORTDOCS%%%%DOCSDIR%%/copyright +share/icons/hicolor/128x128/apps/amiberry.png +share/icons/hicolor/256x256/apps/amiberry.png +share/icons/hicolor/512x512/apps/amiberry.png +share/icons/hicolor/64x64/apps/amiberry.png share/man/man1/amiberry.1.gz share/metainfo/Amiberry.metainfo.xml share/mime/packages/amiberry.xml