ShuriZma
/
xenia
mirror of https://github.com/xenia-project/xenia.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix lint errors :)

This commit is contained in:
DrChat 2017-09-03 20:02:45 -05:00
parent 121a2d655a
commit 1358b94f4d
2 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/xenia/gpu/vulkan/vulkan_command_processor.cc
View File

@ -91,9 +91,7 @@ bool VulkanCommandProcessor::SetupContext() {
render_cache_ = std::make_unique<RenderCache>(register_file_, device_); render_cache_ = std::make_unique<RenderCache>(register_file_, device_);
VkEventCreateInfo info = { VkEventCreateInfo info = {
VK_STRUCTURE_TYPE_EVENT_CREATE_INFO, VK_STRUCTURE_TYPE_EVENT_CREATE_INFO, nullptr, 0,
nullptr,
0,
}; };
VkResult result = VkResult result =
@ -441,8 +439,7 @@ void VulkanCommandProcessor::PerformSwap(uint32_t frontbuffer_ptr,
nullptr, 1, &barrier); nullptr, 1, &barrier);
VkRect2D src_rect = { VkRect2D src_rect = {
{0, 0}, {0, 0}, {frontbuffer_width, frontbuffer_height},
{frontbuffer_width, frontbuffer_height},
}; };
blitter_->BlitTexture2D( blitter_->BlitTexture2D(
copy_commands, current_batch_fence_, copy_commands, current_batch_fence_,
@ -1005,8 +1002,7 @@ bool VulkanCommandProcessor::IssueCopy() {
if (is_color_source) { if (is_color_source) {
// Source from a color target. // Source from a color target.
uint32_t color_info[4] = { uint32_t color_info[4] = {
regs[XE_GPU_REG_RB_COLOR_INFO].u32, regs[XE_GPU_REG_RB_COLOR_INFO].u32, regs[XE_GPU_REG_RB_COLOR1_INFO].u32,
regs[XE_GPU_REG_RB_COLOR1_INFO].u32,
regs[XE_GPU_REG_RB_COLOR2_INFO].u32, regs[XE_GPU_REG_RB_COLOR2_INFO].u32,
regs[XE_GPU_REG_RB_COLOR3_INFO].u32, regs[XE_GPU_REG_RB_COLOR3_INFO].u32,
}; };
@ -1123,6 +1119,7 @@ bool VulkanCommandProcessor::IssueCopy() {
*/ */
case CopyCommand::kConvert: { case CopyCommand::kConvert: {
/*
if (!is_color_source && copy_regs->copy_dest_info.copy_dest_swap == 0) { if (!is_color_source && copy_regs->copy_dest_info.copy_dest_swap == 0) {
// Depth images are a bit more complicated. Try a blit! // Depth images are a bit more complicated. Try a blit!
render_cache_->BlitToImage( render_cache_->BlitToImage(
@ -1133,6 +1130,7 @@ bool VulkanCommandProcessor::IssueCopy() {
{resolve_extent.width, resolve_extent.height, 1}); {resolve_extent.width, resolve_extent.height, 1});
break; break;
} }
*/
// Blit with blitter. // Blit with blitter.
auto view = render_cache_->FindTileView( auto view = render_cache_->FindTileView(

13
src/xenia/ui/vulkan/blitter.cc
View File

@ -207,10 +207,7 @@ void Blitter::BlitTexture2D(VkCommandBuffer command_buffer, VkFence fence,
vkCmdSetViewport(command_buffer, 0, 1, &viewport); vkCmdSetViewport(command_buffer, 0, 1, &viewport);
VkRect2D scissor = { VkRect2D scissor = {
dst_offset.x, dst_offset.x, dst_offset.y, dst_extents.width, dst_extents.height,
dst_offset.y,
dst_extents.width,
dst_extents.height,
}; };
vkCmdSetScissor(command_buffer, 0, 1, &scissor); vkCmdSetScissor(command_buffer, 0, 1, &scissor);
@ -259,10 +256,7 @@ void Blitter::BlitTexture2D(VkCommandBuffer command_buffer, VkFence fence,
&vtx_constants); &vtx_constants);
PixPushConstants pix_constants = { PixPushConstants pix_constants = {
0, 0, 0, 0, swap_channels ? 1 : 0,
0,
0,
swap_channels ? 1 : 0,
}; };
vkCmdPushConstants(command_buffer, pipeline_layout_, vkCmdPushConstants(command_buffer, pipeline_layout_,
VK_SHADER_STAGE_FRAGMENT_BIT, sizeof(VtxPushConstants), VK_SHADER_STAGE_FRAGMENT_BIT, sizeof(VtxPushConstants),
@ -497,8 +491,7 @@ VkPipeline Blitter::CreatePipeline(VkRenderPass render_pass,
dynamic_state_info.pNext = nullptr; dynamic_state_info.pNext = nullptr;
dynamic_state_info.flags = 0; dynamic_state_info.flags = 0;
VkDynamicState dynamic_states[] = { VkDynamicState dynamic_states[] = {
VK_DYNAMIC_STATE_VIEWPORT, VK_DYNAMIC_STATE_VIEWPORT, VK_DYNAMIC_STATE_SCISSOR,
VK_DYNAMIC_STATE_SCISSOR,
}; };
dynamic_state_info.dynamicStateCount = dynamic_state_info.dynamicStateCount =
static_cast<uint32_t>(xe::countof(dynamic_states)); static_cast<uint32_t>(xe::countof(dynamic_states));