octo/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vk_resource_pool: Add back eSampledImage

Browse Source 
* It's used by format reinterpreter
This commit is contained in:
GPUCode
2023-03-06 22:28:31 +02:00
parent 0a8f11ca63
commit a23fbae391
3 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/citra_qt/configuration/configure_debug.ui
View File

@@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>443</width> <width>523</width>
<height>358</height> <height>491</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@@ -112,11 +112,23 @@
<string>CPU</string> <string>CPU</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<item row="1" column="0"> <item row="2" column="0">
<widget class="QWidget" name="clock_speed_widget" native="true"> <widget class="QWidget" name="clock_speed_widget" native="true">
<layout class="QHBoxLayout" name="clock_speed_layout"> <layout class="QHBoxLayout" name="clock_speed_layout">
<property name="spacing"> <property name="spacing">
<number>7</number> <number>11</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property> </property>
<item> <item>
<widget class="QComboBox" name="clock_speed_combo"> <widget class="QComboBox" name="clock_speed_combo">
@@ -180,7 +192,7 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="3" column="0">
<widget class="QCheckBox" name="toggle_cpu_jit"> <widget class="QCheckBox" name="toggle_cpu_jit">
<property name="toolTip"> <property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enables the use of the ARM JIT compiler for emulating the 3DS CPUs. Don't disable unless for debugging purposes&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enables the use of the ARM JIT compiler for emulating the 3DS CPUs. Don't disable unless for debugging purposes&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -190,23 +202,20 @@
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="1" column="0">
<widget class="QCheckBox" name="toggle_renderer_debug">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enables debug reporting in the currently selected graphics API. Causes measurable performance loss, don't enable unless for debugging purposes&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Enable debug renderer</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="toggle_dump_command_buffers"> <widget class="QCheckBox" name="toggle_dump_command_buffers">
<property name="text"> <property name="text">
<string>Dump command buffers</string> <string>Dump command buffers</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0">
<widget class="QCheckBox" name="toggle_renderer_debug">
<property name="text">
<string>Enable debug renderer</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>

1
src/video_core/renderer_vulkan/vk_rasterizer.cpp
View File

@@ -615,6 +615,7 @@ void RasterizerVulkan::BindShadowCube(const Pica::TexturingRegs::FullTextureConf
} }
void RasterizerVulkan::BindTextureCube(const Pica::TexturingRegs::FullTextureConfig& texture) { void RasterizerVulkan::BindTextureCube(const Pica::TexturingRegs::FullTextureConfig& texture) {
LOG_WARNING(Render_Vulkan, "Using texture cube, might be slow");
using CubeFace = Pica::TexturingRegs::CubeFace; using CubeFace = Pica::TexturingRegs::CubeFace;
const VideoCore::TextureCubeConfig config = { const VideoCore::TextureCubeConfig config = {
.px = regs.texturing.GetCubePhysicalAddress(CubeFace::PositiveX), .px = regs.texturing.GetCubePhysicalAddress(CubeFace::PositiveX),

3
src/video_core/renderer_vulkan/vk_resource_pool.cpp
View File

@@ -128,9 +128,10 @@ void DescriptorPool::Allocate(std::size_t begin, std::size_t end) {
vk::DescriptorPool& pool = pools.emplace_back(); vk::DescriptorPool& pool = pools.emplace_back();
// Choose a sane pool size good for most games // Choose a sane pool size good for most games
static constexpr std::array<vk::DescriptorPoolSize, 4> pool_sizes = {{ static constexpr std::array<vk::DescriptorPoolSize, 5> pool_sizes = {{
{vk::DescriptorType::eUniformBuffer, 4096}, {vk::DescriptorType::eUniformBuffer, 4096},
{vk::DescriptorType::eCombinedImageSampler, 8192}, {vk::DescriptorType::eCombinedImageSampler, 8192},
{vk::DescriptorType::eSampledImage, 1024},
{vk::DescriptorType::eUniformTexelBuffer, 4096}, {vk::DescriptorType::eUniformTexelBuffer, 4096},
{vk::DescriptorType::eStorageImage, 1024}, {vk::DescriptorType::eStorageImage, 1024},
}}; }};