popux/perfect_dark
1
0 Fork 0
forked from Ports/perfect_dark
Code Pull Requests Activity

port: change the loaded_texture system yet again; fix a couple crashes

Browse Source 
in combat sim once in a million years, in G5 and Villa
This commit is contained in:
fgsfds committed 2023-08-13 18:52:15 +02:00
1 parent d51a7bc9d6
commit 6750bd9422
1 file changed
+105 -150
Download Patch File Download Diff File Expand all files Collapse all files
port/fast3d/gfx_pc.cpp
+105 -150
View File
@@ -32,7 +32,6 @@
#include "gfx_screen_config.h" #include "gfx_screen_config.h"
uintptr_t gfxFramebuffer; uintptr_t gfxFramebuffer;
std::stack<std::string> currentDir;
using namespace std; using namespace std;
@@ -142,6 +141,15 @@ struct RawTexMetadata {
float h_byte_scale = 1, v_pixel_scale = 1; float h_byte_scale = 1, v_pixel_scale = 1;
}; };
struct LoadedTexture {
const uint8_t* addr;
uint32_t orig_size_bytes;
uint32_t full_size_bytes; // full_image_line_size_bytes * height
uint32_t size_bytes; // line_size_bytes * height
uint32_t full_image_line_size_bytes;
uint32_t line_size_bytes;
};
static struct RDP { static struct RDP {
uint16_t palette[256]; uint16_t palette[256];
const uint8_t* palette_addrs[2]; const uint8_t* palette_addrs[2];
@@ -153,18 +161,7 @@ static struct RDP {
uint32_t tex_flags; uint32_t tex_flags;
struct RawTexMetadata raw_tex_metadata; struct RawTexMetadata raw_tex_metadata;
} texture_to_load; } texture_to_load;
struct { std::unordered_map<uint16_t, LoadedTexture> loaded_texture;
const uint8_t* addr;
uint32_t orig_size_bytes;
uint32_t full_size_bytes; // full_image_line_size_bytes * height
uint32_t size_bytes; // line_size_bytes * height
uint32_t full_image_line_size_bytes;
uint32_t line_size_bytes;
uint32_t tex_flags;
struct RawTexMetadata raw_tex_metadata;
bool masked;
bool blended;
} loaded_texture[3];
struct { struct {
uint8_t fmt; uint8_t fmt;
uint8_t siz; uint8_t siz;
@@ -175,7 +172,6 @@ static struct RDP {
uint16_t tmem; // 0-511, in 64-bit word units uint16_t tmem; // 0-511, in 64-bit word units
uint32_t line_size_bytes; uint32_t line_size_bytes;
uint8_t palette; uint8_t palette;
uint8_t tmem_index; // 0 or 1 for offset 0 kB or offset 2 kB, respectively; 2 if this is a mip
uint8_t level; uint8_t level;
} texture_tile[8]; } texture_tile[8];
bool textures_changed[2]; bool textures_changed[2];
@@ -571,14 +567,14 @@ static void gfx_texture_cache_delete(const uint8_t* orig_addr) {
} }
} }
static void import_texture_rgba16(int tile, bool importReplacement) { static void import_texture_rgba16(int tile, const LoadedTexture& loaded_texture) {
const RawTexMetadata* metadata = &rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].raw_tex_metadata; const uint8_t* addr = loaded_texture.addr;
const uint8_t* addr = rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].addr; const uint32_t size_bytes = loaded_texture.size_bytes;
const uint32_t size_bytes = rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].size_bytes; const uint32_t full_image_line_size_bytes = loaded_texture.full_image_line_size_bytes;
const uint32_t full_image_line_size_bytes = const uint32_t line_size_bytes = loaded_texture.line_size_bytes;
rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].full_image_line_size_bytes; // SUPPORT_CHECK(full_image_line_size_bytes == line_size_bytes);
const uint32_t line_size_bytes = rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].line_size_bytes; // TODO: this trips in some places with a garbage size in full_image_line_size_bytes
SUPPORT_CHECK(full_image_line_size_bytes == line_size_bytes); // probably wherever framebuffer effects are used
uint8_t *dest = tex_upload_buffer; uint8_t *dest = tex_upload_buffer;
for (uint32_t i = 0; i < size_bytes / 2; i++, dest += 4) { for (uint32_t i = 0; i < size_bytes / 2; i++, dest += 4) {
@@ -597,16 +593,15 @@ static void import_texture_rgba16(int tile, bool importReplacement) {
const uint32_t height = size_bytes / rdp.texture_tile[tile].line_size_bytes; const uint32_t height = size_bytes / rdp.texture_tile[tile].line_size_bytes;
gfx_rapi->upload_texture(tex_upload_buffer, width, height); gfx_rapi->upload_texture(tex_upload_buffer, width, height);
// DumpTexture(rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].otr_path, rgba32_buf, width, height); // DumpTexture(loaded_texture.otr_path, rgba32_buf, width, height);
} }
static void import_texture_rgba32(int tile, bool importReplacement) { static void import_texture_rgba32(int tile, const LoadedTexture& loaded_texture) {
const RawTexMetadata* metadata = &rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].raw_tex_metadata; const uint8_t* addr = loaded_texture.addr;
const uint8_t* addr = rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].addr; const uint32_t size_bytes = loaded_texture.size_bytes;
const uint32_t size_bytes = rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].size_bytes;
const uint32_t full_image_line_size_bytes = const uint32_t full_image_line_size_bytes =
rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].full_image_line_size_bytes; loaded_texture.full_image_line_size_bytes;
const uint32_t line_size_bytes = rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].line_size_bytes; const uint32_t line_size_bytes = loaded_texture.line_size_bytes;
SUPPORT_CHECK(full_image_line_size_bytes == line_size_bytes); SUPPORT_CHECK(full_image_line_size_bytes == line_size_bytes);
uint32_t *dest = (uint32_t *)tex_upload_buffer; uint32_t *dest = (uint32_t *)tex_upload_buffer;
@@ -618,16 +613,15 @@ static void import_texture_rgba32(int tile, bool importReplacement) {
const uint32_t width = rdp.texture_tile[tile].line_size_bytes / 2; const uint32_t width = rdp.texture_tile[tile].line_size_bytes / 2;
const uint32_t height = (size_bytes / 2) / rdp.texture_tile[tile].line_size_bytes; const uint32_t height = (size_bytes / 2) / rdp.texture_tile[tile].line_size_bytes;
gfx_rapi->upload_texture(tex_upload_buffer, width, height); gfx_rapi->upload_texture(tex_upload_buffer, width, height);
// DumpTexture(rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].otr_path, addr, width, height); // DumpTexture(loaded_texture.otr_path, addr, width, height);
} }
static void import_texture_ia4(int tile, bool importReplacement) { static void import_texture_ia4(int tile, const LoadedTexture& loaded_texture) {
const RawTexMetadata* metadata = &rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].raw_tex_metadata; const uint8_t* addr = loaded_texture.addr;
const uint8_t* addr = rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].addr; const uint32_t size_bytes = loaded_texture.size_bytes;
const uint32_t size_bytes = rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].size_bytes;
const uint32_t full_image_line_size_bytes = const uint32_t full_image_line_size_bytes =
rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].full_image_line_size_bytes; loaded_texture.full_image_line_size_bytes;
const uint32_t line_size_bytes = rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].line_size_bytes; const uint32_t line_size_bytes = loaded_texture.line_size_bytes;
SUPPORT_CHECK(full_image_line_size_bytes == line_size_bytes); SUPPORT_CHECK(full_image_line_size_bytes == line_size_bytes);
uint8_t *dest = tex_upload_buffer; uint8_t *dest = tex_upload_buffer;
@@ -647,16 +641,15 @@ static void import_texture_ia4(int tile, bool importReplacement) {
const uint32_t height = size_bytes / rdp.texture_tile[tile].line_size_bytes; const uint32_t height = size_bytes / rdp.texture_tile[tile].line_size_bytes;
gfx_rapi->upload_texture(tex_upload_buffer, width, height); gfx_rapi->upload_texture(tex_upload_buffer, width, height);
// DumpTexture(rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].otr_path, rgba32_buf, width, height); // DumpTexture(loaded_texture.otr_path, rgba32_buf, width, height);
} }
static void import_texture_ia8(int tile, bool importReplacement) { static void import_texture_ia8(int tile, const LoadedTexture& loaded_texture) {
const RawTexMetadata* metadata = &rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].raw_tex_metadata; const uint8_t* addr = loaded_texture.addr;
const uint8_t* addr = rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].addr; const uint32_t size_bytes = loaded_texture.size_bytes;
const uint32_t size_bytes = rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].size_bytes;
const uint32_t full_image_line_size_bytes = const uint32_t full_image_line_size_bytes =
rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].full_image_line_size_bytes; loaded_texture.full_image_line_size_bytes;
const uint32_t line_size_bytes = rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].line_size_bytes; const uint32_t line_size_bytes = loaded_texture.line_size_bytes;
SUPPORT_CHECK(full_image_line_size_bytes == line_size_bytes); SUPPORT_CHECK(full_image_line_size_bytes == line_size_bytes);
uint8_t *dest = tex_upload_buffer; uint8_t *dest = tex_upload_buffer;
@@ -673,16 +666,15 @@ static void import_texture_ia8(int tile, bool importReplacement) {
const uint32_t height = size_bytes / rdp.texture_tile[tile].line_size_bytes; const uint32_t height = size_bytes / rdp.texture_tile[tile].line_size_bytes;
gfx_rapi->upload_texture(tex_upload_buffer, width, height); gfx_rapi->upload_texture(tex_upload_buffer, width, height);
// DumpTexture(rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].otr_path, rgba32_buf, width, height); // DumpTexture(loaded_texture.otr_path, rgba32_buf, width, height);
} }
static void import_texture_ia16(int tile, bool importReplacement) { static void import_texture_ia16(int tile, const LoadedTexture& loaded_texture) {
const RawTexMetadata* metadata = &rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].raw_tex_metadata; const uint8_t* addr = loaded_texture.addr;
const uint8_t* addr = rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].addr; const uint32_t size_bytes = loaded_texture.size_bytes;
const uint32_t size_bytes = rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].size_bytes;
const uint32_t full_image_line_size_bytes = const uint32_t full_image_line_size_bytes =
rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].full_image_line_size_bytes; loaded_texture.full_image_line_size_bytes;
const uint32_t line_size_bytes = rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].line_size_bytes; const uint32_t line_size_bytes = loaded_texture.line_size_bytes;
SUPPORT_CHECK(full_image_line_size_bytes == line_size_bytes); SUPPORT_CHECK(full_image_line_size_bytes == line_size_bytes);
uint8_t *dest = tex_upload_buffer; uint8_t *dest = tex_upload_buffer;
@@ -699,16 +691,15 @@ static void import_texture_ia16(int tile, bool importReplacement) {
const uint32_t height = size_bytes / rdp.texture_tile[tile].line_size_bytes; const uint32_t height = size_bytes / rdp.texture_tile[tile].line_size_bytes;
gfx_rapi->upload_texture(tex_upload_buffer, width, height); gfx_rapi->upload_texture(tex_upload_buffer, width, height);
// DumpTexture(rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].otr_path, rgba32_buf, width, height); // DumpTexture(loaded_texture.otr_path, rgba32_buf, width, height);
} }
static void import_texture_i4(int tile, bool importReplacement) { static void import_texture_i4(int tile, const LoadedTexture& loaded_texture) {
const RawTexMetadata* metadata = &rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].raw_tex_metadata; const uint8_t* addr = loaded_texture.addr;
const uint8_t* addr = rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].addr; const uint32_t size_bytes = loaded_texture.size_bytes;
const uint32_t size_bytes = rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].size_bytes;
const uint32_t full_image_line_size_bytes = const uint32_t full_image_line_size_bytes =
rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].full_image_line_size_bytes; loaded_texture.full_image_line_size_bytes;
const uint32_t line_size_bytes = rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].line_size_bytes; const uint32_t line_size_bytes = loaded_texture.line_size_bytes;
SUPPORT_CHECK(full_image_line_size_bytes == line_size_bytes); SUPPORT_CHECK(full_image_line_size_bytes == line_size_bytes);
uint8_t *dest = tex_upload_buffer; uint8_t *dest = tex_upload_buffer;
@@ -726,16 +717,15 @@ static void import_texture_i4(int tile, bool importReplacement) {
const uint32_t height = size_bytes / rdp.texture_tile[tile].line_size_bytes; const uint32_t height = size_bytes / rdp.texture_tile[tile].line_size_bytes;
gfx_rapi->upload_texture(tex_upload_buffer, width, height); gfx_rapi->upload_texture(tex_upload_buffer, width, height);
// DumpTexture(rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].otr_path, rgba32_buf, width, height); // DumpTexture(loaded_texture.otr_path, rgba32_buf, width, height);
} }
static void import_texture_i8(int tile, bool importReplacement) { static void import_texture_i8(int tile, const LoadedTexture& loaded_texture) {
const RawTexMetadata* metadata = &rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].raw_tex_metadata; const uint8_t* addr = loaded_texture.addr;
const uint8_t* addr = rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].addr; const uint32_t size_bytes = loaded_texture.size_bytes;
const uint32_t size_bytes = rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].size_bytes;
uint32_t full_image_line_size_bytes = uint32_t full_image_line_size_bytes =
rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].full_image_line_size_bytes; loaded_texture.full_image_line_size_bytes;
const uint32_t line_size_bytes = rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].line_size_bytes; const uint32_t line_size_bytes = loaded_texture.line_size_bytes;
SUPPORT_CHECK(full_image_line_size_bytes == line_size_bytes); SUPPORT_CHECK(full_image_line_size_bytes == line_size_bytes);
uint8_t *dest = tex_upload_buffer; uint8_t *dest = tex_upload_buffer;
@@ -751,7 +741,7 @@ static void import_texture_i8(int tile, bool importReplacement) {
const uint32_t height = size_bytes / rdp.texture_tile[tile].line_size_bytes; const uint32_t height = size_bytes / rdp.texture_tile[tile].line_size_bytes;
gfx_rapi->upload_texture(tex_upload_buffer, width, height); gfx_rapi->upload_texture(tex_upload_buffer, width, height);
// DumpTexture(rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].otr_path, rgba32_buf, width, height); // DumpTexture(loaded_texture.otr_path, rgba32_buf, width, height);
} }
static inline void palette_to_rgba32(const uint16_t palentry, uint8_t *rgba32_buf) { static inline void palette_to_rgba32(const uint16_t palentry, uint8_t *rgba32_buf) {
@@ -775,13 +765,12 @@ static inline void palette_to_rgba32(const uint16_t palentry, uint8_t *rgba32_bu
} }
} }
static void import_texture_ci4(int tile, bool importReplacement) { static void import_texture_ci4(int tile, const LoadedTexture& loaded_texture) {
const RawTexMetadata* metadata = &rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].raw_tex_metadata; const uint8_t* addr = loaded_texture.addr;
const uint8_t* addr = rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].addr; const uint32_t size_bytes = loaded_texture.size_bytes;
const uint32_t size_bytes = rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].size_bytes;
const uint32_t full_image_line_size_bytes = const uint32_t full_image_line_size_bytes =
rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].full_image_line_size_bytes; loaded_texture.full_image_line_size_bytes;
const uint32_t line_size_bytes = rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].line_size_bytes; const uint32_t line_size_bytes = loaded_texture.line_size_bytes;
const uint32_t pal_idx = rdp.texture_tile[tile].palette; // 0-15 const uint32_t pal_idx = rdp.texture_tile[tile].palette; // 0-15
const uint16_t* palette = (const uint16_t *)(rdp.palette + pal_idx * 16); // 16 pixel entries, 16 bits each const uint16_t* palette = (const uint16_t *)(rdp.palette + pal_idx * 16); // 16 pixel entries, 16 bits each
SUPPORT_CHECK(full_image_line_size_bytes == line_size_bytes); SUPPORT_CHECK(full_image_line_size_bytes == line_size_bytes);
@@ -793,23 +782,18 @@ static void import_texture_ci4(int tile, bool importReplacement) {
} }
uint32_t result_line_size = rdp.texture_tile[tile].line_size_bytes; uint32_t result_line_size = rdp.texture_tile[tile].line_size_bytes;
if (metadata->h_byte_scale != 1) {
result_line_size *= metadata->h_byte_scale;
}
const uint32_t width = result_line_size * 2; const uint32_t width = result_line_size * 2;
const uint32_t height = size_bytes / result_line_size; const uint32_t height = size_bytes / result_line_size;
gfx_rapi->upload_texture(tex_upload_buffer, width, height); gfx_rapi->upload_texture(tex_upload_buffer, width, height);
} }
static void import_texture_ci8(int tile, bool importReplacement) { static void import_texture_ci8(int tile, const LoadedTexture& loaded_texture) {
const RawTexMetadata* metadata = &rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].raw_tex_metadata; const uint8_t* addr = loaded_texture.addr;
const uint8_t* addr = rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].addr; const uint32_t size_bytes = loaded_texture.size_bytes;
const uint32_t size_bytes = rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].size_bytes;
const uint32_t full_image_line_size_bytes = const uint32_t full_image_line_size_bytes =
rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].full_image_line_size_bytes; loaded_texture.full_image_line_size_bytes;
const uint32_t line_size_bytes = rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].line_size_bytes; const uint32_t line_size_bytes = loaded_texture.line_size_bytes;
for (uint32_t i = 0, j = 0; i < size_bytes; j += full_image_line_size_bytes - line_size_bytes) { for (uint32_t i = 0, j = 0; i < size_bytes; j += full_image_line_size_bytes - line_size_bytes) {
for (uint32_t k = 0; k < line_size_bytes; i++, k++, j++) { for (uint32_t k = 0; k < line_size_bytes; i++, k++, j++) {
@@ -819,36 +803,31 @@ static void import_texture_ci8(int tile, bool importReplacement) {
} }
uint32_t result_line_size = rdp.texture_tile[tile].line_size_bytes; uint32_t result_line_size = rdp.texture_tile[tile].line_size_bytes;
if (metadata->h_byte_scale != 1) {
result_line_size *= metadata->h_byte_scale;
}
const uint32_t width = result_line_size; const uint32_t width = result_line_size;
const uint32_t height = size_bytes / result_line_size; const uint32_t height = size_bytes / result_line_size;
gfx_rapi->upload_texture(tex_upload_buffer, width, height); gfx_rapi->upload_texture(tex_upload_buffer, width, height);
// DumpTexture(rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].otr_path, rgba32_buf, width, height); // DumpTexture(loaded_texture.otr_path, rgba32_buf, width, height);
} }
static void import_texture(int i, int tile, bool importReplacement) { static void import_texture(int i, int tile, bool importReplacement) {
const uint8_t fmt = rdp.texture_tile[tile].fmt; const uint8_t fmt = rdp.texture_tile[tile].fmt;
const uint8_t siz = rdp.texture_tile[tile].siz; const uint8_t siz = rdp.texture_tile[tile].siz;
const uint32_t texFlags = rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].tex_flags; const uint32_t tmem_index = rdp.texture_tile[tile].tmem;
const uint32_t tmem_index = rdp.texture_tile[tile].tmem_index;
const uint8_t palette_index = rdp.texture_tile[tile].palette; const uint8_t palette_index = rdp.texture_tile[tile].palette;
LoadedTexture& loaded_texture = rdp.loaded_texture[tmem_index];
if (rdp.tex_lod && tile == rdp.first_tile_index) { if (rdp.tex_lod && tile == rdp.first_tile_index) {
// set up miplevel 0 // set up miplevel 0
rdp.loaded_texture[tmem_index].line_size_bytes = rdp.texture_tile[tile].line_size_bytes; loaded_texture.line_size_bytes = rdp.texture_tile[tile].line_size_bytes;
rdp.loaded_texture[tmem_index].full_image_line_size_bytes = rdp.texture_tile[tile].line_size_bytes; loaded_texture.full_image_line_size_bytes = rdp.texture_tile[tile].line_size_bytes;
rdp.loaded_texture[tmem_index].full_size_bytes = rdp.loaded_texture[tmem_index].full_image_line_size_bytes * rdp.texture_tile[tile].height; loaded_texture.full_size_bytes = loaded_texture.full_image_line_size_bytes * rdp.texture_tile[tile].height;
rdp.loaded_texture[tmem_index].size_bytes = rdp.loaded_texture[tmem_index].line_size_bytes * rdp.texture_tile[tile].height; loaded_texture.size_bytes = loaded_texture.line_size_bytes * rdp.texture_tile[tile].height;
rdp.loaded_texture[tmem_index].orig_size_bytes = rdp.loaded_texture[tmem_index].size_bytes; loaded_texture.orig_size_bytes = loaded_texture.size_bytes;
rdp.loaded_texture[tmem_index].addr = rdp.texture_to_load.addr; loaded_texture.addr = rdp.texture_to_load.addr;
} }
const RawTexMetadata* metadata = &rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].raw_tex_metadata; const uint8_t* orig_addr = loaded_texture.addr;
const uint8_t* orig_addr = rdp.loaded_texture[tmem_index].addr;
SUPPORT_CHECK(orig_addr); SUPPORT_CHECK(orig_addr);
TextureCacheKey key; TextureCacheKey key;
@@ -864,35 +843,35 @@ static void import_texture(int i, int tile, bool importReplacement) {
if (fmt == G_IM_FMT_RGBA) { if (fmt == G_IM_FMT_RGBA) {
if (siz == G_IM_SIZ_16b) { if (siz == G_IM_SIZ_16b) {
import_texture_rgba16(tile, importReplacement); import_texture_rgba16(tile, loaded_texture);
} else if (siz == G_IM_SIZ_32b) { } else if (siz == G_IM_SIZ_32b) {
import_texture_rgba32(tile, importReplacement); import_texture_rgba32(tile, loaded_texture);
} else { } else {
abort(); abort();
} }
} else if (fmt == G_IM_FMT_IA) { } else if (fmt == G_IM_FMT_IA) {
if (siz == G_IM_SIZ_4b) { if (siz == G_IM_SIZ_4b) {
import_texture_ia4(tile, importReplacement); import_texture_ia4(tile, loaded_texture);
} else if (siz == G_IM_SIZ_8b) { } else if (siz == G_IM_SIZ_8b) {
import_texture_ia8(tile, importReplacement); import_texture_ia8(tile, loaded_texture);
} else if (siz == G_IM_SIZ_16b) { } else if (siz == G_IM_SIZ_16b) {
import_texture_ia16(tile, importReplacement); import_texture_ia16(tile, loaded_texture);
} else { } else {
abort(); abort();
} }
} else if (fmt == G_IM_FMT_CI) { } else if (fmt == G_IM_FMT_CI) {
if (siz == G_IM_SIZ_4b) { if (siz == G_IM_SIZ_4b) {
import_texture_ci4(tile, importReplacement); import_texture_ci4(tile, loaded_texture);
} else if (siz == G_IM_SIZ_8b) { } else if (siz == G_IM_SIZ_8b) {
import_texture_ci8(tile, importReplacement); import_texture_ci8(tile, loaded_texture);
} else { } else {
abort(); abort();
} }
} else if (fmt == G_IM_FMT_I) { } else if (fmt == G_IM_FMT_I) {
if (siz == G_IM_SIZ_4b) { if (siz == G_IM_SIZ_4b) {
import_texture_i4(tile, importReplacement); import_texture_i4(tile, loaded_texture);
} else if (siz == G_IM_SIZ_8b) { } else if (siz == G_IM_SIZ_8b) {
import_texture_i8(tile, importReplacement); import_texture_i8(tile, loaded_texture);
} else { } else {
abort(); abort();
} }
@@ -1293,18 +1272,6 @@ static void gfx_sp_tri1(uint8_t vtx1_idx, uint8_t vtx2_idx, uint8_t vtx3_idx, bo
if (use_grayscale) { if (use_grayscale) {
cc_options |= (uint64_t)SHADER_OPT_GRAYSCALE; cc_options |= (uint64_t)SHADER_OPT_GRAYSCALE;
} }
if (rdp.loaded_texture[0].masked) {
cc_options |= (uint64_t)SHADER_OPT_TEXEL0_MASK;
}
if (rdp.loaded_texture[1].masked) {
cc_options |= (uint64_t)SHADER_OPT_TEXEL1_MASK;
}
if (rdp.loaded_texture[0].blended) {
cc_options |= (uint64_t)SHADER_OPT_TEXEL0_BLEND;
}
if (rdp.loaded_texture[1].blended) {
cc_options |= (uint64_t)SHADER_OPT_TEXEL1_BLEND;
}
// If we are not using alpha, clear the alpha components of the combiner as they have no effect // If we are not using alpha, clear the alpha components of the combiner as they have no effect
if (!use_alpha) { if (!use_alpha) {
@@ -1333,7 +1300,7 @@ static void gfx_sp_tri1(uint8_t vtx1_idx, uint8_t vtx2_idx, uint8_t vtx3_idx, bo
uint8_t cms = rdp.texture_tile[tile].cms; uint8_t cms = rdp.texture_tile[tile].cms;
uint8_t cmt = rdp.texture_tile[tile].cmt; uint8_t cmt = rdp.texture_tile[tile].cmt;
uint32_t tex_size_bytes = rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].orig_size_bytes; uint32_t tex_size_bytes = rdp.loaded_texture[rdp.texture_tile[tile].tmem].orig_size_bytes;
uint32_t line_size = rdp.texture_tile[tile].line_size_bytes; uint32_t line_size = rdp.texture_tile[tile].line_size_bytes;
if (line_size == 0) { if (line_size == 0) {
@@ -1799,6 +1766,10 @@ static void gfx_dp_set_tile(uint8_t fmt, uint32_t siz, uint32_t line, uint32_t t
if (fmt == G_IM_FMT_RGBA && siz < G_IM_SIZ_16b) { if (fmt == G_IM_FMT_RGBA && siz < G_IM_SIZ_16b) {
// HACK: sometimes the game will submit G_IM_FMT_RGBA, G_IM_SIZ_8b/4b, intending it to read as I8/I4 // HACK: sometimes the game will submit G_IM_FMT_RGBA, G_IM_SIZ_8b/4b, intending it to read as I8/I4
fmt = G_IM_FMT_I; fmt = G_IM_FMT_I;
} else if (fmt == G_IM_FMT_IA && siz == G_IM_SIZ_32b) {
// HACK: ... and sometimes it submits this, apparently intending it to be I8
fmt = G_IM_FMT_I;
siz = G_IM_SIZ_8b;
} }
rdp.texture_tile[tile].palette = palette; // palette should set upper 4 bits of color index in 4b mode rdp.texture_tile[tile].palette = palette; // palette should set upper 4 bits of color index in 4b mode
@@ -1818,11 +1789,6 @@ static void gfx_dp_set_tile(uint8_t fmt, uint32_t siz, uint32_t line, uint32_t t
const int max_lod = rdp.texture_tile[rdp.first_tile_index].level; const int max_lod = rdp.texture_tile[rdp.first_tile_index].level;
const int this_lod = tile - rdp.first_tile_index; const int this_lod = tile - rdp.first_tile_index;
rdp.texture_tile[tile].tmem = tmem; rdp.texture_tile[tile].tmem = tmem;
if (max_lod && this_lod > 0 && this_lod <= max_lod) {
rdp.texture_tile[tile].tmem_index = 2; // a mip for rdp.first_tile_index
} else {
rdp.texture_tile[tile].tmem_index = (tmem != 0);
}
rdp.textures_changed[0] = true; rdp.textures_changed[0] = true;
rdp.textures_changed[1] = true; rdp.textures_changed[1] = true;
} }
@@ -1888,18 +1854,14 @@ static void gfx_dp_load_block(uint8_t tile, uint32_t uls, uint32_t ult, uint32_t
size_bytes *= rdp.texture_to_load.raw_tex_metadata.h_byte_scale; size_bytes *= rdp.texture_to_load.raw_tex_metadata.h_byte_scale;
size_bytes *= rdp.texture_to_load.raw_tex_metadata.v_pixel_scale; size_bytes *= rdp.texture_to_load.raw_tex_metadata.v_pixel_scale;
} }
rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].orig_size_bytes = orig_size_bytes;
rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].size_bytes = size_bytes;
rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].full_size_bytes = size_bytes;
rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].line_size_bytes = size_bytes;
rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].full_image_line_size_bytes = size_bytes;
// assert(size_bytes <= 4096 && "bug: too big texture");
rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].tex_flags = rdp.texture_to_load.tex_flags;
rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].raw_tex_metadata = rdp.texture_to_load.raw_tex_metadata;
rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].addr = rdp.texture_to_load.addr;
rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].masked = false; LoadedTexture& loaded_texture = rdp.loaded_texture[rdp.texture_tile[tile].tmem];
rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].blended = false; loaded_texture.orig_size_bytes = orig_size_bytes;
loaded_texture.size_bytes = size_bytes;
loaded_texture.full_size_bytes = size_bytes;
loaded_texture.line_size_bytes = size_bytes;
loaded_texture.full_image_line_size_bytes = size_bytes;
loaded_texture.addr = rdp.texture_to_load.addr;
// LoadBlock will probably affect both textures // LoadBlock will probably affect both textures
rdp.textures_changed[0] = rdp.textures_changed[1] = true; rdp.textures_changed[0] = rdp.textures_changed[1] = true;
@@ -1932,19 +1894,13 @@ static void gfx_dp_load_tile(uint8_t tile, uint32_t uls, uint32_t ult, uint32_t
tile_line_size_bytes *= h_byte_scale; tile_line_size_bytes *= h_byte_scale;
} }
rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].orig_size_bytes = orig_size_bytes; LoadedTexture& loaded_texture = rdp.loaded_texture[rdp.texture_tile[tile].tmem];
rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].size_bytes = size_bytes; loaded_texture.orig_size_bytes = orig_size_bytes;
rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].full_size_bytes = full_image_line_size_bytes * tile_height; loaded_texture.size_bytes = size_bytes;
rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].full_image_line_size_bytes = full_image_line_size_bytes; loaded_texture.full_size_bytes = full_image_line_size_bytes * tile_height;
rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].line_size_bytes = tile_line_size_bytes; loaded_texture.full_image_line_size_bytes = full_image_line_size_bytes;
loaded_texture.line_size_bytes = tile_line_size_bytes;
// assert(size_bytes <= 4096 && "bug: too big texture"); loaded_texture.addr = rdp.texture_to_load.addr + start_offset_bytes;
rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].tex_flags = rdp.texture_to_load.tex_flags;
rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].raw_tex_metadata = rdp.texture_to_load.raw_tex_metadata;
rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].addr = rdp.texture_to_load.addr + start_offset_bytes;
rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].masked = false;
rdp.loaded_texture[rdp.texture_tile[tile].tmem_index].blended = false;
rdp.texture_tile[tile].uls = uls; rdp.texture_tile[tile].uls = uls;
rdp.texture_tile[tile].ult = ult; rdp.texture_tile[tile].ult = ult;
@@ -1953,10 +1909,10 @@ static void gfx_dp_load_tile(uint8_t tile, uint32_t uls, uint32_t ult, uint32_t
rdp.texture_tile[tile].width = ((lrs - uls) >> G_TEXTURE_IMAGE_FRAC) + 1; rdp.texture_tile[tile].width = ((lrs - uls) >> G_TEXTURE_IMAGE_FRAC) + 1;
rdp.texture_tile[tile].height = ((lrt - ult) >> G_TEXTURE_IMAGE_FRAC) + 1; rdp.texture_tile[tile].height = ((lrt - ult) >> G_TEXTURE_IMAGE_FRAC) + 1;
if (rdp.texture_tile[tile].tmem_index == 2) { if (rdp.tex_lod) {
rdp.textures_changed[0] = rdp.textures_changed[1] = true; rdp.textures_changed[0] = rdp.textures_changed[1] = true;
} else { } else {
rdp.textures_changed[rdp.texture_tile[tile].tmem_index] = true; rdp.textures_changed[rdp.texture_tile[tile].tmem != 0] = true;
} }
} }
@@ -2665,7 +2621,6 @@ extern "C" void gfx_run(Gfx* commands) {
gfx_run_dl(commands); gfx_run_dl(commands);
gfx_flush(); gfx_flush();
gfxFramebuffer = 0; gfxFramebuffer = 0;
currentDir = std::stack<std::string>();
if (game_renders_to_framebuffer) { if (game_renders_to_framebuffer) {
gfx_rapi->start_draw_to_framebuffer(0, 1); gfx_rapi->start_draw_to_framebuffer(0, 1);