summaryrefslogtreecommitdiffstats
path: root/src/video_core/engines
diff options
context:
space:
mode:
authorFernando Sahmkow <fsahmkow27@gmail.com>2019-09-15 20:25:07 +0200
committerFernandoS27 <fsahmkow27@gmail.com>2019-09-19 17:41:29 +0200
commit7606da5611b5626790e99b4387e033eaea20c2cb (patch)
tree1ce0273ad940c847b6fb4d1832de579f069d3615 /src/video_core/engines
parentVideo Core: initial Implementation of InstanceDraw Packaging (diff)
downloadyuzu-7606da5611b5626790e99b4387e033eaea20c2cb.tar
yuzu-7606da5611b5626790e99b4387e033eaea20c2cb.tar.gz
yuzu-7606da5611b5626790e99b4387e033eaea20c2cb.tar.bz2
yuzu-7606da5611b5626790e99b4387e033eaea20c2cb.tar.lz
yuzu-7606da5611b5626790e99b4387e033eaea20c2cb.tar.xz
yuzu-7606da5611b5626790e99b4387e033eaea20c2cb.tar.zst
yuzu-7606da5611b5626790e99b4387e033eaea20c2cb.zip
Diffstat (limited to 'src/video_core/engines')
-rw-r--r--src/video_core/engines/maxwell_3d.cpp35
-rw-r--r--src/video_core/engines/maxwell_3d.h7
2 files changed, 32 insertions, 10 deletions
diff --git a/src/video_core/engines/maxwell_3d.cpp b/src/video_core/engines/maxwell_3d.cpp
index 48fc1a9e1..d1f63a5eb 100644
--- a/src/video_core/engines/maxwell_3d.cpp
+++ b/src/video_core/engines/maxwell_3d.cpp
@@ -260,6 +260,9 @@ void Maxwell3D::CallMacroMethod(u32 method, std::size_t num_parameters, const u3
// Execute the current macro.
macro_interpreter.Execute(macro_positions[entry], num_parameters, parameters);
+ if (mme_draw.current_mode != MMMEDrawMode::Undefined) {
+ FlushMMEInlineDraw();
+ }
}
void Maxwell3D::CallMethod(const GPU::MethodCall& method_call) {
@@ -426,25 +429,37 @@ void Maxwell3D::CallMethodFromMME(const GPU::MethodCall& method_call) {
regs.reg_array[method] = method_call.argument;
if (method == MAXWELL3D_REG_INDEX(vertex_buffer.count) ||
method == MAXWELL3D_REG_INDEX(index_array.count)) {
- MMMEDrawMode expected_mode = method == MAXWELL3D_REG_INDEX(vertex_buffer.count)
- ? MMMEDrawMode::Array
- : MMMEDrawMode::Indexed;
- u32 count = method_call.argument;
+ const MMMEDrawMode expected_mode = method == MAXWELL3D_REG_INDEX(vertex_buffer.count)
+ ? MMMEDrawMode::Array
+ : MMMEDrawMode::Indexed;
+ const u32 count = method_call.argument;
while (true) {
if (mme_draw.current_mode == MMMEDrawMode::Undefined) {
- mme_draw.current_mode = expected_mode;
- mme_draw.current_count = count;
- mme_draw.instance_count = 1;
+ if (mme_draw.gl_begin_consume) {
+ mme_draw.current_mode = expected_mode;
+ mme_draw.current_count = count;
+ mme_draw.instance_count = 1;
+ mme_draw.gl_begin_consume = false;
+ mme_draw.gl_end_count = 0;
+ }
break;
} else {
- if (mme_draw.current_mode == expected_mode && count == mme_draw.current_count) {
+ if (mme_draw.current_mode == expected_mode && count == mme_draw.current_count &&
+ mme_draw.instance_mode && mme_draw.gl_begin_consume) {
mme_draw.instance_count++;
+ mme_draw.gl_begin_consume = false;
break;
} else {
FlushMMEInlineDraw();
}
}
}
+ } else if (method == MAXWELL3D_REG_INDEX(draw.vertex_begin_gl)) {
+ mme_draw.instance_mode =
+ (regs.draw.instance_next != 0) || (regs.draw.instance_cont != 0);
+ mme_draw.gl_begin_consume = true;
+ } else {
+ mme_draw.gl_end_count++;
}
} else {
if (mme_draw.current_mode != MMMEDrawMode::Undefined) {
@@ -458,6 +473,7 @@ void Maxwell3D::FlushMMEInlineDraw() {
LOG_DEBUG(HW_GPU, "called, topology={}, count={}", static_cast<u32>(regs.draw.topology.Value()),
regs.vertex_buffer.count);
ASSERT_MSG(!(regs.index_array.count && regs.vertex_buffer.count), "Both indexed and direct?");
+ ASSERT(mme_draw.instance_count == mme_draw.gl_end_count);
auto debug_context = system.GetGPUDebugContext();
@@ -488,6 +504,9 @@ void Maxwell3D::FlushMMEInlineDraw() {
mme_draw.current_mode = MMMEDrawMode::Undefined;
mme_draw.current_count = 0;
mme_draw.instance_count = 0;
+ mme_draw.instance_mode = false;
+ mme_draw.gl_begin_consume = false;
+ mme_draw.gl_end_count = 0;
}
void Maxwell3D::ProcessMacroUpload(u32 data) {
diff --git a/src/video_core/engines/maxwell_3d.h b/src/video_core/engines/maxwell_3d.h
index 1547d930e..8fd3ec85c 100644
--- a/src/video_core/engines/maxwell_3d.h
+++ b/src/video_core/engines/maxwell_3d.h
@@ -1277,8 +1277,11 @@ public:
struct MMEDrawState {
MMMEDrawMode current_mode{MMMEDrawMode::Undefined};
- u32 current_count;
- u32 instance_count;
+ u32 current_count{};
+ u32 instance_count{};
+ bool instance_mode{};
+ bool gl_begin_consume{};
+ u32 gl_end_count{};
} mme_draw;
private: