Browse Source

sync with master (2/2)

vk-experiments2
lizzie 1 month ago
parent
commit
44f6229b26
  1. 1
      src/video_core/engines/engine_interface.h
  2. 6
      src/video_core/engines/kepler_compute.cpp
  3. 5
      src/video_core/engines/maxwell_dma.cpp

1
src/video_core/engines/engine_interface.h

@ -7,7 +7,6 @@
#pragma once
#include <array>
#include <boost/container/small_vector.hpp>
#include "common/common_types.h"

6
src/video_core/engines/kepler_compute.cpp

@ -16,8 +16,10 @@
namespace Tegra::Engines {
KeplerCompute::KeplerCompute(Core::System& system_, MemoryManager& memory_manager_)
: system{system_}, memory_manager{memory_manager_}, upload_state{memory_manager, regs.upload} {
KeplerCompute::KeplerCompute(MemoryManager& memory_manager_)
: memory_manager{memory_manager_}
, upload_state{memory_manager, regs.upload}
{
execution_mask.fill(0);
execution_mask[KEPLER_COMPUTE_REG_INDEX(exec_upload)] = true;
execution_mask[KEPLER_COMPUTE_REG_INDEX(data_upload)] = true;

5
src/video_core/engines/maxwell_dma.cpp

@ -21,8 +21,9 @@ namespace Tegra::Engines {
using namespace Texture;
MaxwellDMA::MaxwellDMA(Core::System& system_, MemoryManager& memory_manager_)
: system{system_}, memory_manager{memory_manager_} {
MaxwellDMA::MaxwellDMA(MemoryManager& memory_manager_)
: memory_manager{memory_manager_}
{
execution_mask.fill(0);
execution_mask[offsetof(Regs, launch_dma) / sizeof(u32)] = true;
}

Loading…
Cancel
Save