Skip to content

Commit

Permalink
Refactoring of Texture dumping
Browse files Browse the repository at this point in the history
  • Loading branch information
@abaire @mborgerson
abaire authored and mborgerson committed Feb 24, 2022
1 parent fd42b36 commit bf95d77
Show file tree
Hide file tree
Showing 2 changed files with 124 additions and 73 deletions.
96 changes: 96 additions & 0 deletions Texture.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,28 @@
from collections import namedtuple
from PIL import Image

from Xbox import Xbox
import XboxHelper
from xboxpy import nv2a

TextureParameters = namedtuple(
"TextureParameters",
[
"width",
"height",
"color_pitch",
"color_offset",
"format_color",
"depth_pitch",
"depth_offset",
"format_depth",
"surface_type",
"swizzle_unk",
"swizzle_unk2",
"swizzled",
],
)

# Right hand side is always in RGB or RGBA channel order.
TextureDescription = namedtuple(
"TextureDescription", ["bpp", "channel_bpps", "channel_offsets"]
Expand Down Expand Up @@ -130,6 +150,82 @@ def surface_zeta_format_to_texture_format(fmt, swizzled, is_float):
)


def read_texture_parameters(xbox: Xbox) -> TextureParameters:
"""Reads the current texture state"""
color_pitch = xbox.read_u32(0xFD400858)
depth_pitch = xbox.read_u32(0xFD40085C)

color_offset = xbox.read_u32(0xFD400828)
depth_offset = xbox.read_u32(0xFD40082C)

color_base = xbox.read_u32(0xFD400840)
depth_base = xbox.read_u32(0xFD400844)

# FIXME: Is this correct? pbkit uses _base, but D3D seems to use _offset?
color_offset += color_base
depth_offset += depth_base

surface_clip_x = xbox.read_u32(0xFD4019B4)
surface_clip_y = xbox.read_u32(0xFD4019B8)

draw_format = xbox.read_u32(0xFD400804)
surface_type = xbox.read_u32(0xFD400710)
swizzle_unk = xbox.read_u32(0xFD400818)

swizzle_unk2 = xbox.read_u32(0xFD40086C)

clip_x = (surface_clip_x >> 0) & 0xFFFF
clip_y = (surface_clip_y >> 0) & 0xFFFF

clip_w = (surface_clip_x >> 16) & 0xFFFF
clip_h = (surface_clip_y >> 16) & 0xFFFF

surface_anti_aliasing = (surface_type >> 4) & 3

clip_x, clip_y = XboxHelper.apply_anti_aliasing_factor(
surface_anti_aliasing, clip_x, clip_y
)
clip_w, clip_h = XboxHelper.apply_anti_aliasing_factor(
surface_anti_aliasing, clip_w, clip_h
)

width = clip_x + clip_w
height = clip_y + clip_h

# FIXME: 128 x 128 [pitch = 256 (0x100)], at 0x01AA8000 [PGRAPH: 0x01AA8000?], format 0x5, type: 0x21000002, swizzle: 0x7070000 [used 0]

# FIXME: This does not seem to be a good field for this
# FIXME: Patched to give 50% of coolness
swizzled = (surface_type & 3) == 2
# FIXME: if surface_type is 0, we probably can't even draw..

format_color = (draw_format >> 12) & 0xF
# FIXME: Support 3D surfaces.
_format_depth_buffer = (draw_format >> 18) & 0x3

if not format_color:
fmt_color = None
else:
fmt_color = surface_color_format_to_texture_format(format_color, swizzled)
# TODO: Extract swizzle and float state.
# fmt_depth = surface_zeta_format_to_texture_format(format_depth_buffer)

return TextureParameters(
width=width,
height=height,
color_pitch=color_pitch,
color_offset=color_offset,
format_color=fmt_color,
depth_pitch=depth_pitch,
depth_offset=depth_offset,
format_depth=None,
surface_type=surface_type,
swizzle_unk=swizzle_unk,
swizzle_unk2=swizzle_unk2,
swizzled=swizzled,
)


def dump_texture(xbox, offset, pitch, fmt_color, width, height):
"""Convert the texture at the given offset into a PIL.Image."""
img = None
Expand Down
101 changes: 28 additions & 73 deletions Trace.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -398,78 +398,28 @@ def dump_surfaces(self, _data, *_args):
if not self.enable_surface_dumping:
return []

color_pitch = self.xbox.read_u32(0xFD400858)
depth_pitch = self.xbox.read_u32(0xFD40085C)
params = Texture.read_texture_parameters(self.xbox)

color_offset = self.xbox.read_u32(0xFD400828)
depth_offset = self.xbox.read_u32(0xFD40082C)

color_base = self.xbox.read_u32(0xFD400840)
depth_base = self.xbox.read_u32(0xFD400844)

# FIXME: Is this correct? pbkit uses _base, but D3D seems to use _offset?
color_offset += color_base
depth_offset += depth_base

surface_clip_x = self.xbox.read_u32(0xFD4019B4)
surface_clip_y = self.xbox.read_u32(0xFD4019B8)

draw_format = self.xbox.read_u32(0xFD400804)
surface_type = self.xbox.read_u32(0xFD400710)
swizzle_unk = self.xbox.read_u32(0xFD400818)

swizzle_unk2 = self.xbox.read_u32(0xFD40086C)

clip_x = (surface_clip_x >> 0) & 0xFFFF
clip_y = (surface_clip_y >> 0) & 0xFFFF

clip_w = (surface_clip_x >> 16) & 0xFFFF
clip_h = (surface_clip_y >> 16) & 0xFFFF

surface_anti_aliasing = (surface_type >> 4) & 3

clip_x, clip_y = XboxHelper.apply_anti_aliasing_factor(
surface_anti_aliasing, clip_x, clip_y
)
clip_w, clip_h = XboxHelper.apply_anti_aliasing_factor(
surface_anti_aliasing, clip_w, clip_h
)

width = clip_x + clip_w
height = clip_y + clip_h

# FIXME: 128 x 128 [pitch = 256 (0x100)], at 0x01AA8000 [PGRAPH: 0x01AA8000?], format 0x5, type: 0x21000002, swizzle: 0x7070000 [used 0]

# FIXME: This does not seem to be a good field for this
# FIXME: Patched to give 50% of coolness
swizzled = (surface_type & 3) == 2
# FIXME: if surface_type is 0, we probably can't even draw..

format_color = (draw_format >> 12) & 0xF
# FIXME: Support 3D surfaces.
_format_depth = (draw_format >> 18) & 0x3

if not format_color:
if not params.format_color:
print("Warning: Invalid color format, skipping surface dump.")
return []

fmt_color = Texture.surface_color_format_to_texture_format(
format_color, swizzled
)
# fmt_depth = Texture.surface_zeta_format_to_texture_format(format_depth)

# Dump stuff we might care about
self._write("pgraph.bin", _dump_pgraph(self.xbox))
self._write("pfb.bin", _dump_pfb(self.xbox))
if color_offset and self.enable_raw_pixel_dumping:
if params.color_offset and self.enable_raw_pixel_dumping:
self._write(
"mem-2.bin",
self.xbox.read(0x80000000 | color_offset, color_pitch * height),
self.xbox.read(
0x80000000 | params.color_offset, params.color_pitch * params.height
),
)
if depth_offset and self.enable_raw_pixel_dumping:
if params.depth_offset and self.enable_raw_pixel_dumping:
self._write(
"mem-3.bin",
self.xbox.read(0x80000000 | depth_offset, depth_pitch * height),
self.xbox.read(
0x80000000 | params.depth_offset, params.depth_pitch * params.height
),
)
self._write(
"pgraph-rdi-vp-instructions.bin",
Expand Down Expand Up @@ -511,27 +461,32 @@ def dump_surfaces(self, _data, *_args):
extra_html += [
"%d x %d [pitch = %d (0x%X)], at 0x%08X, format 0x%X, type: 0x%X, swizzle: 0x%08X, 0x%08X [used %d]"
% (
width,
height,
color_pitch,
color_pitch,
color_offset,
format_color,
surface_type,
swizzle_unk,
swizzle_unk2,
swizzled,
params.width,
params.height,
params.color_pitch,
params.color_pitch,
params.color_offset,
params.format_color,
params.surface_type,
params.swizzle_unk,
params.swizzle_unk2,
params.swizzled,
)
]
self._dbg_print(extra_html[-1])

try:
if not color_offset:
if not params.color_offset:
raise Exception("Color offset is null")

self._dbg_print("Attempting to dump surface; swizzle: %s" % (str(swizzled)))
self._dbg_print("Attempting to dump surface; swizzle: %s" % (str(params.swizzled)))
img = Texture.dump_texture(
self.xbox, color_offset, color_pitch, fmt_color, width, height
self.xbox,
params.color_offset,
params.color_pitch,
params.format_color,
params.width,
params.height,
)
except: # pylint: disable=bare-except
img = None
Expand Down

0 comments on commit bf95d77

Please sign in to comment.