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

[dxvk] Renamed DxvkBufferSlice methods for convenience

Browse Source
This commit is contained in:
Philip Rebohle 2017-12-14 19:09:49 +01:00
parent 9827ace3b0
commit 4502816bb6
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/d3d11/d3d11_context.cpp
View File

@ -414,7 +414,7 @@ namespace dxvk {
if (size != 0) { if (size != 0) {
m_context->updateBuffer( m_context->updateBuffer(
bufferSlice.buffer(), bufferSlice.buffer(),
bufferSlice.bufferOffset() + offset, bufferSlice.offset() + offset,
size, pSrcData); size, pSrcData);
} }
} else { } else {
@ -641,8 +641,8 @@ namespace dxvk {
bufferSlice = DxvkBufferSlice( bufferSlice = DxvkBufferSlice(
baseSlice.buffer(), baseSlice.buffer(),
baseSlice.bufferOffset() + binding.offset, baseSlice.offset() + binding.offset,
baseSlice.bufferRange() - binding.offset); baseSlice.length() - binding.offset);
} }
m_context->bindVertexBuffer( m_context->bindVertexBuffer(
@ -670,8 +670,8 @@ namespace dxvk {
bufferSlice = DxvkBufferSlice( bufferSlice = DxvkBufferSlice(
baseSlice.buffer(), baseSlice.buffer(),
baseSlice.bufferOffset() + binding.offset, baseSlice.offset() + binding.offset,
baseSlice.bufferRange() - binding.offset); baseSlice.length() - binding.offset);
} }
// As in Vulkan, the index format can be either a 32-bit // As in Vulkan, the index format can be either a 32-bit

4
src/d3d11/d3d11_device.cpp
View File

@ -1156,8 +1156,8 @@ namespace dxvk {
m_dxvkDevice->createCommandList()); m_dxvkDevice->createCommandList());
m_resourceInitContext->updateBuffer( m_resourceInitContext->updateBuffer(
bufferSlice.buffer(), bufferSlice.buffer(),
bufferSlice.bufferOffset(), bufferSlice.offset(),
bufferSlice.bufferRange(), bufferSlice.length(),
pInitialData->pSysMem); pInitialData->pSysMem);
m_dxvkDevice->submitCommandList( m_dxvkDevice->submitCommandList(
m_resourceInitContext->endRecording(), m_resourceInitContext->endRecording(),

6
src/dxvk/dxvk_buffer.h
View File

@ -180,17 +180,17 @@ namespace dxvk {
return m_buffer; return m_buffer;
} }
VkBuffer bufferHandle() const { VkBuffer handle() const {
return m_buffer != nullptr return m_buffer != nullptr
? m_buffer->handle() ? m_buffer->handle()
: VK_NULL_HANDLE; : VK_NULL_HANDLE;
} }
size_t bufferOffset() const { size_t offset() const {
return m_offset; return m_offset;
} }
size_t bufferRange() const { size_t length() const {
return m_length; return m_length;
} }

10
src/dxvk/dxvk_context.cpp
View File

@ -898,10 +898,10 @@ namespace dxvk {
if (m_flags.test(DxvkContextFlag::GpDirtyIndexBuffer)) { if (m_flags.test(DxvkContextFlag::GpDirtyIndexBuffer)) {
m_flags.clr(DxvkContextFlag::GpDirtyIndexBuffer); m_flags.clr(DxvkContextFlag::GpDirtyIndexBuffer);
if (m_state.vi.indexBuffer.bufferHandle() != VK_NULL_HANDLE) { if (m_state.vi.indexBuffer.handle() != VK_NULL_HANDLE) {
m_cmd->cmdBindIndexBuffer( m_cmd->cmdBindIndexBuffer(
m_state.vi.indexBuffer.bufferHandle(), m_state.vi.indexBuffer.handle(),
m_state.vi.indexBuffer.bufferOffset(), m_state.vi.indexBuffer.offset(),
m_state.vi.indexType); m_state.vi.indexType);
m_cmd->trackResource( m_cmd->trackResource(
m_state.vi.indexBuffer.buffer()); m_state.vi.indexBuffer.buffer());
@ -917,8 +917,8 @@ namespace dxvk {
for (uint32_t i = 0; i < m_state.vi.vertexBuffers.size(); i++) { for (uint32_t i = 0; i < m_state.vi.vertexBuffers.size(); i++) {
const DxvkBufferSlice vbo = m_state.vi.vertexBuffers.at(i); const DxvkBufferSlice vbo = m_state.vi.vertexBuffers.at(i);
VkBuffer handle = vbo.bufferHandle(); VkBuffer handle = vbo.handle();
VkDeviceSize offset = vbo.bufferOffset(); VkDeviceSize offset = vbo.offset();
if (handle != VK_NULL_HANDLE) { if (handle != VK_NULL_HANDLE) {
m_cmd->cmdBindVertexBuffers(i, 1, &handle, &offset); m_cmd->cmdBindVertexBuffers(i, 1, &handle, &offset);