encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-06-04 13:41:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused Device member in D3D12 TextureView and BufferView

Browse Source
This commit is contained in:
Austin Eng 2017-06-30 11:55:54 -04:00 committed by Austin Eng
parent beb76d06db
commit 6774bce06e
5 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/d3d12/BufferD3D12.cpp
View File

@ -119,8 +119,8 @@ namespace d3d12 {
} }
BufferView::BufferView(Device* device, BufferViewBuilder* builder) BufferView::BufferView(BufferViewBuilder* builder)
: BufferViewBase(builder), device(device) { : BufferViewBase(builder) {
cbvDesc.BufferLocation = ToBackend(GetBuffer())->GetVA() + GetOffset(); cbvDesc.BufferLocation = ToBackend(GetBuffer())->GetVA() + GetOffset();
cbvDesc.SizeInBytes = GetD3D12Size(); cbvDesc.SizeInBytes = GetD3D12Size();

3
src/backend/d3d12/BufferD3D12.h
View File

@ -48,14 +48,13 @@ namespace d3d12 {
class BufferView : public BufferViewBase { class BufferView : public BufferViewBase {
public: public:
BufferView(Device* device, BufferViewBuilder* builder); BufferView(BufferViewBuilder* builder);
uint32_t GetD3D12Size() const; uint32_t GetD3D12Size() const;
const D3D12_CONSTANT_BUFFER_VIEW_DESC& GetCBVDescriptor() const; const D3D12_CONSTANT_BUFFER_VIEW_DESC& GetCBVDescriptor() const;
const D3D12_UNORDERED_ACCESS_VIEW_DESC& GetUAVDescriptor() const; const D3D12_UNORDERED_ACCESS_VIEW_DESC& GetUAVDescriptor() const;
private: private:
Device* device;
D3D12_CONSTANT_BUFFER_VIEW_DESC cbvDesc; D3D12_CONSTANT_BUFFER_VIEW_DESC cbvDesc;
D3D12_UNORDERED_ACCESS_VIEW_DESC uavDesc; D3D12_UNORDERED_ACCESS_VIEW_DESC uavDesc;
}; };

4
src/backend/d3d12/D3D12Backend.cpp
View File

@ -205,7 +205,7 @@ namespace d3d12 {
return new Buffer(this, builder); return new Buffer(this, builder);
} }
BufferViewBase* Device::CreateBufferView(BufferViewBuilder* builder) { BufferViewBase* Device::CreateBufferView(BufferViewBuilder* builder) {
return new BufferView(this, builder); return new BufferView(builder);
} }
CommandBufferBase* Device::CreateCommandBuffer(CommandBufferBuilder* builder) { CommandBufferBase* Device::CreateCommandBuffer(CommandBufferBuilder* builder) {
return new CommandBuffer(this, builder); return new CommandBuffer(this, builder);
@ -241,7 +241,7 @@ namespace d3d12 {
return new Texture(this, builder); return new Texture(this, builder);
} }
TextureViewBase* Device::CreateTextureView(TextureViewBuilder* builder) { TextureViewBase* Device::CreateTextureView(TextureViewBuilder* builder) {
return new TextureView(this, builder); return new TextureView(builder);
} }
void Device::Reference() { void Device::Reference() {

2
src/backend/d3d12/TextureD3D12.cpp
View File

@ -129,7 +129,7 @@ namespace d3d12 {
} }
} }
TextureView::TextureView(Device* device, TextureViewBuilder* builder) TextureView::TextureView(TextureViewBuilder* builder)
: TextureViewBase(builder) { : TextureViewBase(builder) {
srvDesc.Format = D3D12TextureFormat(GetTexture()->GetFormat()); srvDesc.Format = D3D12TextureFormat(GetTexture()->GetFormat());

3
src/backend/d3d12/TextureD3D12.h
View File

@ -42,14 +42,13 @@ namespace d3d12 {
class TextureView : public TextureViewBase { class TextureView : public TextureViewBase {
public: public:
TextureView(Device* device, TextureViewBuilder* builder); TextureView(TextureViewBuilder* builder);
const D3D12_SHADER_RESOURCE_VIEW_DESC& GetSRVDescriptor() const; const D3D12_SHADER_RESOURCE_VIEW_DESC& GetSRVDescriptor() const;
private: private:
D3D12_SHADER_RESOURCE_VIEW_DESC srvDesc; D3D12_SHADER_RESOURCE_VIEW_DESC srvDesc;
}; };
} }
} }