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

[dxvk] Removed buffer stride stuff for now, we need a better solution

Browse Source
This commit is contained in:
Philip Rebohle 2017-12-07 19:28:54 +01:00
parent 27e63cbdc6
commit ade00add8d
5 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/d3d11/d3d11_context.cpp
View File

@ -561,8 +561,7 @@ namespace dxvk {
}
m_context->bindVertexBuffer(
StartSlot + i, dxvkBinding,
binding.stride);
StartSlot + i, dxvkBinding);
}
}
@ -1286,6 +1285,7 @@ namespace dxvk {
// TODO D3D11 docs aren't clear about what should happen
// when there are undefined scissor rects for a viewport.
// Figure out what it does on Windows.
// FIXME Compute correct vertical position
if (enableScissorTest && (i < m_state.rs.numScissors)) {
const D3D11_RECT& sr = m_state.rs.scissors.at(i);

6
src/d3d11/d3d11_device.cpp
View File

@ -373,10 +373,12 @@ namespace dxvk {
attributes.push_back(attrib);
// Create vertex input binding description.
// Create vertex input binding description. The
// stride is dynamic state in D3D11 and will be
// set by D3D11DeviceContext::IASetVertexBuffers.
VkVertexInputBindingDescription binding;
binding.binding = pInputElementDescs[i].InputSlot;
binding.stride = 12;
binding.stride = 0;
binding.inputRate = VK_VERTEX_INPUT_RATE_VERTEX;
if (pInputElementDescs[i].InputSlotClass == D3D11_INPUT_PER_INSTANCE_DATA) {

8
src/dxvk/dxvk_context.cpp
View File

@ -183,17 +183,11 @@ namespace dxvk {
void DxvkContext::bindVertexBuffer(
uint32_t binding,
const DxvkBufferBinding& buffer,
uint32_t stride) {
const DxvkBufferBinding& buffer) {
if (m_state.vi.vertexBuffers.at(binding) != buffer) {
m_state.vi.vertexBuffers.at(binding) = buffer;
m_flags.set(DxvkContextFlag::GpDirtyVertexBuffers);
}
if (m_state.vi.vertexStrides.at(binding) != stride) {
m_state.vi.vertexStrides.at(binding) = stride;
m_flags.set(DxvkContextFlag::GpDirtyPipelineState);
}
}

3
src/dxvk/dxvk_context.h
View File

@ -140,8 +140,7 @@ namespace dxvk {
*/
void bindVertexBuffer(
uint32_t binding,
const DxvkBufferBinding& buffer,
uint32_t stride);
const DxvkBufferBinding& buffer);
/**
* \brief Clears subresources of a color image

2
src/dxvk/dxvk_context_state.h
View File

@ -42,8 +42,6 @@ namespace dxvk {
std::array<DxvkBufferBinding,
DxvkLimits::MaxNumVertexBindings> vertexBuffers;
std::array<uint32_t,
DxvkLimits::MaxNumVertexBindings> vertexStrides;
};