rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-02-12 04:54:17 +01:00
Code Issues Projects Releases Wiki Activity

[dxvk] Rename renderPassBegin/End methods to start/spillRenderPass

Browse Source
This commit is contained in:
Philip Rebohle 2018-04-23 11:11:40 +02:00
parent a5c43b5e59
commit d91114d733
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/dxvk/dxvk_context.cpp
View File

@ -48,7 +48,7 @@ namespace dxvk {
Rc<DxvkCommandList> DxvkContext::endRecording() { Rc<DxvkCommandList> DxvkContext::endRecording() {
this->renderPassEnd(); this->spillRenderPass();
this->endActiveQueries(); this->endActiveQueries();
this->trackQueryPool(m_queryPools[VK_QUERY_TYPE_OCCLUSION]); this->trackQueryPool(m_queryPools[VK_QUERY_TYPE_OCCLUSION]);
@ -87,7 +87,7 @@ namespace dxvk {
void DxvkContext::bindFramebuffer(const Rc<DxvkFramebuffer>& fb) { void DxvkContext::bindFramebuffer(const Rc<DxvkFramebuffer>& fb) {
if (m_state.om.framebuffer != fb) { if (m_state.om.framebuffer != fb) {
this->renderPassEnd(); this->spillRenderPass();
if (fb != nullptr) { if (fb != nullptr) {
m_state.gp.state.msSampleCount = fb->sampleCount(); m_state.gp.state.msSampleCount = fb->sampleCount();
@ -232,7 +232,7 @@ namespace dxvk {
VkDeviceSize offset, VkDeviceSize offset,
VkDeviceSize length, VkDeviceSize length,
uint32_t value) { uint32_t value) {
this->renderPassEnd(); this->spillRenderPass();
auto slice = buffer->subSlice(offset, length); auto slice = buffer->subSlice(offset, length);
@ -258,7 +258,7 @@ namespace dxvk {
VkDeviceSize offset, VkDeviceSize offset,
VkDeviceSize length, VkDeviceSize length,
VkClearColorValue value) { VkClearColorValue value) {
this->renderPassEnd(); this->spillRenderPass();
this->unbindComputePipeline(); this->unbindComputePipeline();
// Query pipeline objects to use for this clear operation // Query pipeline objects to use for this clear operation
@ -325,7 +325,7 @@ namespace dxvk {
const Rc<DxvkImage>& image, const Rc<DxvkImage>& image,
const VkClearColorValue& value, const VkClearColorValue& value,
const VkImageSubresourceRange& subresources) { const VkImageSubresourceRange& subresources) {
this->renderPassEnd(); this->spillRenderPass();
m_barriers.accessImage(image, subresources, m_barriers.accessImage(image, subresources,
VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_UNDEFINED,
@ -357,7 +357,7 @@ namespace dxvk {
const Rc<DxvkImage>& image, const Rc<DxvkImage>& image,
const VkClearDepthStencilValue& value, const VkClearDepthStencilValue& value,
const VkImageSubresourceRange& subresources) { const VkImageSubresourceRange& subresources) {
this->renderPassEnd(); this->spillRenderPass();
m_barriers.accessImage( m_barriers.accessImage(
image, subresources, image, subresources,
@ -401,7 +401,7 @@ namespace dxvk {
attachmentIndex = m_state.om.framebuffer->findAttachment(imageView); attachmentIndex = m_state.om.framebuffer->findAttachment(imageView);
if (attachmentIndex == MaxNumRenderTargets) { if (attachmentIndex == MaxNumRenderTargets) {
this->renderPassEnd(); this->spillRenderPass();
// Set up and bind a temporary framebuffer // Set up and bind a temporary framebuffer
DxvkRenderTargets attachments; DxvkRenderTargets attachments;
@ -419,7 +419,7 @@ namespace dxvk {
} else { } else {
// Make sure that the currently bound // Make sure that the currently bound
// framebuffer can be rendered to // framebuffer can be rendered to
this->renderPassBegin(); this->startRenderPass();
} }
// Clear the attachment in quesion // Clear the attachment in quesion
@ -446,7 +446,7 @@ namespace dxvk {
VkOffset3D offset, VkOffset3D offset,
VkExtent3D extent, VkExtent3D extent,
VkClearColorValue value) { VkClearColorValue value) {
this->renderPassEnd(); this->spillRenderPass();
this->unbindComputePipeline(); this->unbindComputePipeline();
// Query pipeline objects to use for this clear operation // Query pipeline objects to use for this clear operation
@ -529,7 +529,7 @@ namespace dxvk {
if (numBytes == 0) if (numBytes == 0)
return; return;
this->renderPassEnd(); this->spillRenderPass();
auto dstSlice = dstBuffer->subSlice(dstOffset, numBytes); auto dstSlice = dstBuffer->subSlice(dstOffset, numBytes);
auto srcSlice = srcBuffer->subSlice(srcOffset, numBytes); auto srcSlice = srcBuffer->subSlice(srcOffset, numBytes);
@ -571,7 +571,7 @@ namespace dxvk {
const Rc<DxvkBuffer>& srcBuffer, const Rc<DxvkBuffer>& srcBuffer,
VkDeviceSize srcOffset, VkDeviceSize srcOffset,
VkExtent2D srcExtent) { VkExtent2D srcExtent) {
this->renderPassEnd(); this->spillRenderPass();
auto srcSlice = srcBuffer->subSlice(srcOffset, 0); auto srcSlice = srcBuffer->subSlice(srcOffset, 0);
@ -635,7 +635,7 @@ namespace dxvk {
VkImageSubresourceLayers srcSubresource, VkImageSubresourceLayers srcSubresource,
VkOffset3D srcOffset, VkOffset3D srcOffset,
VkExtent3D extent) { VkExtent3D extent) {
this->renderPassEnd(); this->spillRenderPass();
VkImageSubresourceRange dstSubresourceRange = { VkImageSubresourceRange dstSubresourceRange = {
dstSubresource.aspectMask, dstSubresource.aspectMask,
@ -767,7 +767,7 @@ namespace dxvk {
VkImageSubresourceLayers srcSubresource, VkImageSubresourceLayers srcSubresource,
VkOffset3D srcOffset, VkOffset3D srcOffset,
VkExtent3D srcExtent) { VkExtent3D srcExtent) {
this->renderPassEnd(); this->spillRenderPass();
auto dstSlice = dstBuffer->subSlice(dstOffset, 0); auto dstSlice = dstBuffer->subSlice(dstOffset, 0);
@ -950,7 +950,7 @@ namespace dxvk {
if (subresources.levelCount <= 1) if (subresources.levelCount <= 1)
return; return;
this->renderPassEnd(); this->spillRenderPass();
// The top-most level will only be read. We can // The top-most level will only be read. We can
// discard the contents of all the lower levels // discard the contents of all the lower levels
@ -1097,7 +1097,7 @@ namespace dxvk {
const Rc<DxvkImage>& srcImage, const Rc<DxvkImage>& srcImage,
const VkImageSubresourceLayers& srcSubresources, const VkImageSubresourceLayers& srcSubresources,
VkFormat format) { VkFormat format) {
this->renderPassEnd(); this->spillRenderPass();
if (format == VK_FORMAT_UNDEFINED) if (format == VK_FORMAT_UNDEFINED)
format = srcImage->info().format; format = srcImage->info().format;
@ -1204,7 +1204,7 @@ namespace dxvk {
VkDeviceSize offset, VkDeviceSize offset,
VkDeviceSize size, VkDeviceSize size,
const void* data) { const void* data) {
this->renderPassEnd(); this->spillRenderPass();
// Vulkan specifies that small amounts of data (up to 64kB) can // Vulkan specifies that small amounts of data (up to 64kB) can
// be copied to a buffer directly if the size is a multiple of // be copied to a buffer directly if the size is a multiple of
@ -1250,7 +1250,7 @@ namespace dxvk {
const void* data, const void* data,
VkDeviceSize pitchPerRow, VkDeviceSize pitchPerRow,
VkDeviceSize pitchPerLayer) { VkDeviceSize pitchPerLayer) {
this->renderPassEnd(); this->spillRenderPass();
// Upload data through a staging buffer. Special care needs to // Upload data through a staging buffer. Special care needs to
// be taken when dealing with compressed image formats: Rather // be taken when dealing with compressed image formats: Rather
@ -1490,7 +1490,7 @@ namespace dxvk {
} }
void DxvkContext::renderPassBegin() { void DxvkContext::startRenderPass() {
if (!m_flags.test(DxvkContextFlag::GpRenderPassBound) if (!m_flags.test(DxvkContextFlag::GpRenderPassBound)
&& (m_state.om.framebuffer != nullptr)) { && (m_state.om.framebuffer != nullptr)) {
m_flags.set(DxvkContextFlag::GpRenderPassBound); m_flags.set(DxvkContextFlag::GpRenderPassBound);
@ -1499,7 +1499,7 @@ namespace dxvk {
} }
void DxvkContext::renderPassEnd() { void DxvkContext::spillRenderPass() {
if (m_flags.test(DxvkContextFlag::GpRenderPassBound)) { if (m_flags.test(DxvkContextFlag::GpRenderPassBound)) {
m_flags.clr(DxvkContextFlag::GpRenderPassBound); m_flags.clr(DxvkContextFlag::GpRenderPassBound);
this->renderPassUnbindFramebuffer(); this->renderPassUnbindFramebuffer();
@ -1872,7 +1872,7 @@ namespace dxvk {
void DxvkContext::commitComputeState() { void DxvkContext::commitComputeState() {
this->renderPassEnd(); this->spillRenderPass();
this->updateComputePipeline(); this->updateComputePipeline();
this->updateComputeShaderResources(); this->updateComputeShaderResources();
this->updateComputePipelineState(); this->updateComputePipelineState();
@ -1881,7 +1881,7 @@ namespace dxvk {
void DxvkContext::commitGraphicsState() { void DxvkContext::commitGraphicsState() {
this->renderPassBegin(); this->startRenderPass();
this->updateGraphicsPipeline(); this->updateGraphicsPipeline();
this->updateIndexBufferBinding(); this->updateIndexBufferBinding();
this->updateVertexBufferBindings(); this->updateVertexBufferBindings();
@ -1964,7 +1964,7 @@ namespace dxvk {
void DxvkContext::resetQueryPool(const Rc<DxvkQueryPool>& pool) { void DxvkContext::resetQueryPool(const Rc<DxvkQueryPool>& pool) {
this->renderPassEnd(); this->spillRenderPass();
pool->reset(m_cmd); pool->reset(m_cmd);
} }

4
src/dxvk/dxvk_context.h
View File

@ -632,8 +632,8 @@ namespace dxvk {
std::array<DxvkShaderResourceSlot, MaxNumResourceSlots> m_rc; std::array<DxvkShaderResourceSlot, MaxNumResourceSlots> m_rc;
std::array<DxvkDescriptorInfo, MaxNumActiveBindings> m_descInfos; std::array<DxvkDescriptorInfo, MaxNumActiveBindings> m_descInfos;
void renderPassBegin(); void startRenderPass();
void renderPassEnd(); void spillRenderPass();
void renderPassBindFramebuffer( void renderPassBindFramebuffer(
const Rc<DxvkFramebuffer>& framebuffer); const Rc<DxvkFramebuffer>& framebuffer);