ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nv2a: Add support for compressed 3D textures

This commit is contained in:
Wilhelm Kovatch 2020-10-27 02:17:44 +01:00 committed by mborgerson
parent 6f777e73e6
commit 518c9f38cd
1 changed files with 38 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
hw/xbox/nv2a/pgraph.c
View File

@ -5346,34 +5346,53 @@ static void upload_gl_texture(GLenum gl_target,
unsigned int width = s.width, height = s.height, depth = s.depth; unsigned int width = s.width, height = s.height, depth = s.depth;
assert(f.gl_format != 0); /* FIXME: compressed not supported yet */
assert(f.linear == false); assert(f.linear == false);
int level; int level;
for (level = 0; level < s.levels; level++) { for (level = 0; level < s.levels; level++) {
if (f.gl_format == 0) { /* compressed */
unsigned int row_pitch = width * f.bytes_per_pixel; width = MAX(width, 4); height = MAX(height, 4);
unsigned int slice_pitch = row_pitch * height;
uint8_t *unswizzled = (uint8_t*)g_malloc(slice_pitch * depth);
unswizzle_box(texture_data, width, height, depth, unswizzled,
row_pitch, slice_pitch, f.bytes_per_pixel);
uint8_t *converted = convert_texture_data(s, unswizzled, unsigned int block_size;
palette_data, unsigned int depth_block_size = MIN(depth, 4);
width, height, depth, if (f.gl_internal_format == GL_COMPRESSED_RGBA_S3TC_DXT1_EXT) {
row_pitch, slice_pitch); block_size = 8 * depth_block_size;
} else {
block_size = 16 * depth_block_size;
}
glTexImage3D(gl_target, level, f.gl_internal_format, glCompressedTexImage3D(gl_target, level, f.gl_internal_format,
width, height, depth, 0, width, height, depth, 0,
f.gl_format, f.gl_type, width/4 * height/4 * depth/depth_block_size * block_size,
converted ? converted : unswizzled); texture_data);
if (converted) { texture_data += width/4 * height/4 * depth/4 * block_size;
g_free(converted); } else {
unsigned int row_pitch = width * f.bytes_per_pixel;
unsigned int slice_pitch = row_pitch * height;
uint8_t *unswizzled = (uint8_t*)g_malloc(slice_pitch * depth);
unswizzle_box(texture_data, width, height, depth, unswizzled,
row_pitch, slice_pitch, f.bytes_per_pixel);
uint8_t *converted = convert_texture_data(s, unswizzled,
palette_data,
width, height, depth,
row_pitch, slice_pitch);
glTexImage3D(gl_target, level, f.gl_internal_format,
width, height, depth, 0,
f.gl_format, f.gl_type,
converted ? converted : unswizzled);
if (converted) {
g_free(converted);
}
g_free(unswizzled);
texture_data += width * height * depth * f.bytes_per_pixel;
} }
g_free(unswizzled);
texture_data += width * height * depth * f.bytes_per_pixel;
width /= 2; width /= 2;
height /= 2; height /= 2;