lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-29 21:30:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove MipSlice parameter to make things a little simpler

Browse Source
This commit is contained in:
baldurk
2014-10-07 23:19:57 +01:00
parent 9793ac6312
commit 37e4209cc9
4 changed files with 39 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/api/replay/d3d11_pipestate.h
+1 -3
View File
@@ -86,7 +86,7 @@ struct D3D11PipelineState
ElementOffset(0), ElementWidth(0),
FirstElement(0), NumElements(0),
Flags(0),
HighestMip(0), NumMipLevels(0), MipSlice(0),
HighestMip(0), NumMipLevels(0),
ArraySize(0), FirstArraySlice(0) {}
ResourceId View;
@@ -112,8 +112,6 @@ struct D3D11PipelineState
uint32_t HighestMip;
uint32_t NumMipLevels;
uint32_t MipSlice;
// Texture Array
uint32_t ArraySize;
uint32_t FirstArraySlice;
renderdoc/core/replay_proxy.cpp
-1
View File
@@ -134,7 +134,6 @@ void Serialiser::Serialise(const char *name, D3D11PipelineState::ShaderStage::Re
Serialise("", el.Flags);
Serialise("", el.HighestMip);
Serialise("", el.NumMipLevels);
Serialise("", el.MipSlice);
Serialise("", el.ArraySize);
Serialise("", el.FirstArraySlice);
}
renderdoc/driver/d3d11/d3d11_replay.cpp
+38 -19
View File
@@ -657,29 +657,34 @@ D3D11PipelineState D3D11Replay::MakePipelineState()
}
else if(desc.ViewDimension == D3D11_UAV_DIMENSION_TEXTURE1D)
{
view.MipSlice = desc.Texture1D.MipSlice;
view.HighestMip = desc.Texture1D.MipSlice;
view.NumMipLevels = 1;
}
else if(desc.ViewDimension == D3D11_UAV_DIMENSION_TEXTURE1DARRAY)
{
view.ArraySize = desc.Texture1DArray.ArraySize;
view.FirstArraySlice = desc.Texture1DArray.FirstArraySlice;
view.MipSlice = desc.Texture1DArray.MipSlice;
view.HighestMip = desc.Texture1DArray.MipSlice;
view.NumMipLevels = 1;
}
else if(desc.ViewDimension == D3D11_UAV_DIMENSION_TEXTURE2D)
{
view.MipSlice = desc.Texture2D.MipSlice;
view.HighestMip = desc.Texture2D.MipSlice;
view.NumMipLevels = 1;
}
else if(desc.ViewDimension == D3D11_UAV_DIMENSION_TEXTURE2DARRAY)
{
view.ArraySize = desc.Texture2DArray.ArraySize;
view.FirstArraySlice = desc.Texture2DArray.FirstArraySlice;
view.MipSlice = desc.Texture2DArray.MipSlice;
view.HighestMip = desc.Texture2DArray.MipSlice;
view.NumMipLevels = 1;
}
else if(desc.ViewDimension == D3D11_UAV_DIMENSION_TEXTURE3D)
{
view.ArraySize = desc.Texture3D.WSize;
view.FirstArraySlice = desc.Texture3D.FirstWSlice;
view.MipSlice = desc.Texture3D.MipSlice;
view.HighestMip = desc.Texture3D.MipSlice;
view.NumMipLevels = 1;
}
SAFE_RELEASE(res);
@@ -830,29 +835,34 @@ D3D11PipelineState D3D11Replay::MakePipelineState()
}
else if(desc.ViewDimension == D3D11_RTV_DIMENSION_TEXTURE1D)
{
view.MipSlice = desc.Texture1D.MipSlice;
view.HighestMip = desc.Texture1D.MipSlice;
view.NumMipLevels = 1;
}
else if(desc.ViewDimension == D3D11_RTV_DIMENSION_TEXTURE1DARRAY)
{
view.ArraySize = desc.Texture1DArray.ArraySize;
view.FirstArraySlice = desc.Texture1DArray.FirstArraySlice;
view.MipSlice = desc.Texture1DArray.MipSlice;
view.HighestMip = desc.Texture1DArray.MipSlice;
view.NumMipLevels = 1;
}
else if(desc.ViewDimension == D3D11_RTV_DIMENSION_TEXTURE2D)
{
view.MipSlice = desc.Texture2D.MipSlice;
view.HighestMip = desc.Texture2D.MipSlice;
view.NumMipLevels = 1;
}
else if(desc.ViewDimension == D3D11_RTV_DIMENSION_TEXTURE2DARRAY)
{
view.ArraySize = desc.Texture2DArray.ArraySize;
view.FirstArraySlice = desc.Texture2DArray.FirstArraySlice;
view.MipSlice = desc.Texture2DArray.MipSlice;
view.HighestMip = desc.Texture2DArray.MipSlice;
view.NumMipLevels = 1;
}
else if(desc.ViewDimension == D3D11_RTV_DIMENSION_TEXTURE3D)
{
view.ArraySize = desc.Texture3D.WSize;
view.FirstArraySlice = desc.Texture3D.FirstWSlice;
view.MipSlice = desc.Texture3D.MipSlice;
view.HighestMip = desc.Texture3D.MipSlice;
view.NumMipLevels = 1;
}
SAFE_RELEASE(res);
@@ -898,29 +908,34 @@ D3D11PipelineState D3D11Replay::MakePipelineState()
}
else if(desc.ViewDimension == D3D11_UAV_DIMENSION_TEXTURE1D)
{
view.MipSlice = desc.Texture1D.MipSlice;
view.HighestMip = desc.Texture1D.MipSlice;
view.NumMipLevels = 1;
}
else if(desc.ViewDimension == D3D11_UAV_DIMENSION_TEXTURE1DARRAY)
{
view.ArraySize = desc.Texture1DArray.ArraySize;
view.FirstArraySlice = desc.Texture1DArray.FirstArraySlice;
view.MipSlice = desc.Texture1DArray.MipSlice;
view.HighestMip = desc.Texture1DArray.MipSlice;
view.NumMipLevels = 1;
}
else if(desc.ViewDimension == D3D11_UAV_DIMENSION_TEXTURE2D)
{
view.MipSlice = desc.Texture2D.MipSlice;
view.HighestMip = desc.Texture2D.MipSlice;
view.NumMipLevels = 1;
}
else if(desc.ViewDimension == D3D11_UAV_DIMENSION_TEXTURE2DARRAY)
{
view.ArraySize = desc.Texture2DArray.ArraySize;
view.FirstArraySlice = desc.Texture2DArray.FirstArraySlice;
view.MipSlice = desc.Texture2DArray.MipSlice;
view.HighestMip = desc.Texture2DArray.MipSlice;
view.NumMipLevels = 1;
}
else if(desc.ViewDimension == D3D11_UAV_DIMENSION_TEXTURE3D)
{
view.ArraySize = desc.Texture3D.WSize;
view.FirstArraySlice = desc.Texture3D.FirstWSlice;
view.MipSlice = desc.Texture3D.MipSlice;
view.HighestMip = desc.Texture3D.MipSlice;
view.NumMipLevels = 1;
}
SAFE_RELEASE(res);
@@ -960,23 +975,27 @@ D3D11PipelineState D3D11Replay::MakePipelineState()
if(desc.ViewDimension == D3D11_DSV_DIMENSION_TEXTURE1D)
{
view.MipSlice = desc.Texture1D.MipSlice;
view.HighestMip = desc.Texture1D.MipSlice;
view.NumMipLevels = 1;
}
else if(desc.ViewDimension == D3D11_DSV_DIMENSION_TEXTURE1DARRAY)
{
view.ArraySize = desc.Texture1DArray.ArraySize;
view.FirstArraySlice = desc.Texture1DArray.FirstArraySlice;
view.MipSlice = desc.Texture1DArray.MipSlice;
view.HighestMip = desc.Texture1DArray.MipSlice;
view.NumMipLevels = 1;
}
else if(desc.ViewDimension == D3D11_DSV_DIMENSION_TEXTURE2D)
{
view.MipSlice = desc.Texture2D.MipSlice;
view.HighestMip = desc.Texture2D.MipSlice;
view.NumMipLevels = 1;
}
else if(desc.ViewDimension == D3D11_DSV_DIMENSION_TEXTURE2DARRAY)
{
view.ArraySize = desc.Texture2DArray.ArraySize;
view.FirstArraySlice = desc.Texture2DArray.FirstArraySlice;
view.MipSlice = desc.Texture2DArray.MipSlice;
view.HighestMip = desc.Texture2DArray.MipSlice;
view.NumMipLevels = 1;
}
SAFE_RELEASE(res);
renderdocui/Interop/D3D11PipelineState.cs
-2
View File
@@ -142,8 +142,6 @@ namespace renderdoc
public UInt32 HighestMip;
public UInt32 NumMipLevels;
public UInt32 MipSlice;
// Texture Array
public UInt32 ArraySize;
public UInt32 FirstArraySlice;