Merge branch 'master' of https://github.com/xenia-project/xenia into canary_experimental
This commit is contained in:
@@ -1182,28 +1182,28 @@ void TraceViewer::DrawStateUI() {
|
||||
}
|
||||
|
||||
auto enable_mode =
|
||||
static_cast<ModeControl>(regs[XE_GPU_REG_RB_MODECONTROL] & 0x7);
|
||||
static_cast<EdramMode>(regs[XE_GPU_REG_RB_MODECONTROL] & 0x7);
|
||||
|
||||
switch (enable_mode) {
|
||||
case ModeControl::kIgnore:
|
||||
case EdramMode::kNoOperation:
|
||||
ImGui::Text("Ignored Command %d", player_->current_command_index());
|
||||
break;
|
||||
case ModeControl::kColorDepth:
|
||||
case ModeControl::kDepth: {
|
||||
case EdramMode::kColorDepth:
|
||||
case EdramMode::kDepthOnly: {
|
||||
static const char* kPrimNames[] = {
|
||||
"<none>", "point list", "line list", "line strip",
|
||||
"triangle list", "triangle fan", "triangle strip", "unknown 0x7",
|
||||
"rectangle list", "unknown 0x9", "unknown 0xA", "unknown 0xB",
|
||||
"line loop", "quad list", "quad strip", "unknown 0xF",
|
||||
};
|
||||
ImGui::Text("%s Command %d: %s, %d indices",
|
||||
enable_mode == ModeControl::kColorDepth ? "Color-Depth"
|
||||
: "Depth-only",
|
||||
player_->current_command_index(),
|
||||
kPrimNames[int(draw_info.prim_type)], draw_info.index_count);
|
||||
ImGui::Text(
|
||||
"%s Command %d: %s, %d indices",
|
||||
enable_mode == EdramMode::kColorDepth ? "Color-Depth" : "Depth-only",
|
||||
player_->current_command_index(),
|
||||
kPrimNames[int(draw_info.prim_type)], draw_info.index_count);
|
||||
break;
|
||||
}
|
||||
case ModeControl::kCopy: {
|
||||
case EdramMode::kCopy: {
|
||||
uint32_t copy_dest_base = regs[XE_GPU_REG_RB_COPY_DEST_BASE];
|
||||
ImGui::Text("Copy Command %d (to %.8X)", player_->current_command_index(),
|
||||
copy_dest_base);
|
||||
@@ -1365,7 +1365,7 @@ void TraceViewer::DrawStateUI() {
|
||||
static_cast<xenos::MsaaSamples>((rb_surface_info >> 16) & 0x3);
|
||||
|
||||
if (ImGui::CollapsingHeader("Color Targets")) {
|
||||
if (enable_mode != ModeControl::kDepth) {
|
||||
if (enable_mode != EdramMode::kDepthOnly) {
|
||||
// Alpha testing -- ALPHAREF, ALPHAFUNC, ALPHATESTENABLE
|
||||
// if(ALPHATESTENABLE && frag_out.a [<=/ALPHAFUNC] ALPHAREF) discard;
|
||||
uint32_t color_control = regs[XE_GPU_REG_RB_COLORCONTROL];
|
||||
|
||||
Reference in New Issue
Block a user