From c7ce472eeb6c6ff8892ee0314910031bc807c8c7 Mon Sep 17 00:00:00 2001 From: bunnei Date: Sun, 29 Apr 2018 13:49:16 -0400 Subject: shader_bytecode: Add decoding for FMNMX instruction. --- src/video_core/engines/shader_bytecode.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/video_core/engines') diff --git a/src/video_core/engines/shader_bytecode.h b/src/video_core/engines/shader_bytecode.h index f20c2cd41..e1ceec268 100644 --- a/src/video_core/engines/shader_bytecode.h +++ b/src/video_core/engines/shader_bytecode.h @@ -310,6 +310,7 @@ public: SHR_C, SHR_R, SHR_IMM, + FMNMX, FSETP_C, // Set Predicate FSETP_R, FSETP_IMM, @@ -460,6 +461,7 @@ private: INST("0100110000101---", Id::SHR_C, Type::Arithmetic, "SHR_C"), INST("0101110000101---", Id::SHR_R, Type::Arithmetic, "SHR_R"), INST("0011100-00101---", Id::SHR_IMM, Type::Arithmetic, "SHR_IMM"), + INST("0101110001100---", Id::FMNMX, Type::Arithmetic, "FMNMX"), INST("0100110011100---", Id::I2I_C, Type::Conversion, "I2I_C"), INST("0101110011100---", Id::I2I_R, Type::Conversion, "I2I_R"), INST("01110001-1000---", Id::I2I_IMM, Type::Conversion, "I2I_IMM"), -- cgit v1.2.3 From f41eb95e13b88a55572887c3b5e4890bcb84edb2 Mon Sep 17 00:00:00 2001 From: bunnei Date: Sun, 29 Apr 2018 16:23:31 -0400 Subject: maxwell_3d: Reset vertex counts after drawing. --- src/video_core/engines/maxwell_3d.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/video_core/engines') diff --git a/src/video_core/engines/maxwell_3d.cpp b/src/video_core/engines/maxwell_3d.cpp index 835e5fe78..23e70cd8a 100644 --- a/src/video_core/engines/maxwell_3d.cpp +++ b/src/video_core/engines/maxwell_3d.cpp @@ -208,6 +208,16 @@ void Maxwell3D::DrawArrays() { const bool is_indexed{regs.index_array.count && !regs.vertex_buffer.count}; VideoCore::g_renderer->Rasterizer()->AccelerateDrawBatch(is_indexed); + + // TODO(bunnei): Below, we reset vertex count so that we can use these registers to determine if + // the game is trying to draw indexed or direct mode. This needs to be verified on HW still - + // it's possible that it is incorrect and that there is some other register used to specify the + // drawing mode. + if (is_indexed) { + regs.index_array.count = 0; + } else { + regs.vertex_buffer.count = 0; + } } void Maxwell3D::ProcessCBBind(Regs::ShaderStage stage) { -- cgit v1.2.3