AxioDL/boo
2
0
Fork 0
mirror of https://github.com/AxioDL/boo.git synced 2025-12-09 13:37:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

windows enum refactor fixes

Browse Source
This commit is contained in:
Jack Andersen
2015-11-20 16:58:56 -10:00
parent d040e20096
commit 84b78f2962
7 changed files with 118 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lib/graphicsdev/D3D11.cpp
View File

@@ -55,7 +55,7 @@ class D3D11GraphicsBufferS : public IGraphicsBufferS
: m_stride(stride), m_count(count), m_sz(stride * count)
{
D3D11_SUBRESOURCE_DATA iData = {data};
ThrowIfFailed(ctx->m_dev->CreateBuffer(&CD3D11_BUFFER_DESC(m_sz, USE_TABLE[use], D3D11_USAGE_IMMUTABLE), &iData, &m_buf));
ThrowIfFailed(ctx->m_dev->CreateBuffer(&CD3D11_BUFFER_DESC(m_sz, USE_TABLE[int(use)], D3D11_USAGE_IMMUTABLE), &iData, &m_buf));
}
public:
size_t m_stride;
@@ -74,7 +74,7 @@ class D3D11GraphicsBufferD : public IGraphicsBufferD
{
size_t sz = stride * count;
for (int i=0 ; i<3 ; ++i)
ThrowIfFailed(ctx->m_dev->CreateBuffer(&CD3D11_BUFFER_DESC(sz, USE_TABLE[use],
ThrowIfFailed(ctx->m_dev->CreateBuffer(&CD3D11_BUFFER_DESC(sz, USE_TABLE[int(use)],
D3D11_USAGE_DYNAMIC, D3D11_CPU_ACCESS_WRITE), nullptr, &m_bufs[i]));
}
public:
@@ -257,12 +257,12 @@ struct D3D11VertexFormat : IVertexFormat
{
const VertexElementDescriptor* elemin = &elements[i];
D3D11_INPUT_ELEMENT_DESC& elem = m_elements[i];
elem.SemanticName = SEMANTIC_NAME_TABLE[elemin->semantic];
elem.SemanticName = SEMANTIC_NAME_TABLE[int(elemin->semantic)];
elem.SemanticIndex = elemin->semanticIdx;
elem.Format = SEMANTIC_TYPE_TABLE[elemin->semantic];
elem.Format = SEMANTIC_TYPE_TABLE[int(elemin->semantic)];
elem.AlignedByteOffset = offset;
elem.InputSlotClass = D3D11_INPUT_PER_VERTEX_DATA;
offset += SEMANTIC_SIZE_TABLE[elemin->semantic];
offset += SEMANTIC_SIZE_TABLE[int(elemin->semantic)];
}
}
};
@@ -304,9 +304,9 @@ class D3D11ShaderPipeline : public IShaderPipeline
ThrowIfFailed(ctx->m_dev->CreateDepthStencilState(&dsDesc, &m_dsState));
CD3D11_BLEND_DESC blDesc(D3D11_DEFAULT);
blDesc.RenderTarget[0].BlendEnable = (dstFac != BlendFactorZero);
blDesc.RenderTarget[0].SrcBlend = BLEND_FACTOR_TABLE[srcFac];
blDesc.RenderTarget[0].DestBlend = BLEND_FACTOR_TABLE[dstFac];
blDesc.RenderTarget[0].BlendEnable = (dstFac != BlendFactor::Zero);
blDesc.RenderTarget[0].SrcBlend = BLEND_FACTOR_TABLE[int(srcFac)];
blDesc.RenderTarget[0].DestBlend = BLEND_FACTOR_TABLE[int(dstFac)];
ThrowIfFailed(ctx->m_dev->CreateBlendState(&blDesc, &m_blState));
ThrowIfFailed(ctx->m_dev->CreateInputLayout(vtxFmt->m_elements.get(), vtxFmt->m_elementCount,
@@ -421,12 +421,12 @@ struct D3D11ShaderDataBinding : IShaderDataBinding
ID3D11ShaderResourceView* srvs[8];
for (int i=0 ; i<8 && i<m_texCount ; ++i)
{
if (m_texs[i]->type() == ITexture::TextureDynamic)
if (m_texs[i]->type() == TextureType::Dynamic)
{
D3D11TextureD* ctex = static_cast<D3D11TextureD*>(m_texs[i]);
srvs[i] = ctex->m_srvs[b].Get();
}
else if (m_texs[i]->type() == ITexture::TextureStatic)
else if (m_texs[i]->type() == TextureType::Static)
{
D3D11TextureS* ctex = static_cast<D3D11TextureS*>(m_texs[i]);
srvs[i] = ctex->m_srv.Get();
@@ -439,7 +439,7 @@ struct D3D11ShaderDataBinding : IShaderDataBinding
struct D3D11CommandQueue : IGraphicsCommandQueue
{
Platform platform() const {return IGraphicsDataFactory::PlatformD3D11;}
Platform platform() const {return IGraphicsDataFactory::Platform::D3D11;}
const SystemChar* platformName() const {return _S("D3D11");}
D3D11Context* m_ctx;
D3D11Context::Window* m_windowCtx;
@@ -609,9 +609,9 @@ struct D3D11CommandQueue : IGraphicsCommandQueue
void setDrawPrimitive(Primitive prim)
{
if (prim == PrimitiveTriangles)
if (prim == Primitive::Triangles)
m_deferredCtx->IASetPrimitiveTopology(D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
else if (prim == PrimitiveTriStrips)
else if (prim == Primitive::TriStrips)
m_deferredCtx->IASetPrimitiveTopology(D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
}
@@ -714,7 +714,7 @@ public:
{}
~D3D11DataFactory() = default;
Platform platform() const {return PlatformD3D11;}
Platform platform() const {return Platform::D3D11;}
const SystemChar* platformName() const {return _S("D3D11");}
IGraphicsBufferS* newStaticBuffer(BufferUse use, const void* data, size_t stride, size_t count)

32
lib/graphicsdev/D3D12.cpp
View File

@@ -65,7 +65,7 @@ class D3D12GraphicsBufferS : public IGraphicsBufferS
size_t m_sz;
D3D12_RESOURCE_DESC m_gpuDesc;
D3D12GraphicsBufferS(BufferUse use, D3D12Context* ctx, const void* data, size_t stride, size_t count)
: m_state(USE_TABLE[use]), m_stride(stride), m_count(count), m_sz(stride * count)
: m_state(USE_TABLE[int(use)]), m_stride(stride), m_count(count), m_sz(stride * count)
{
m_gpuDesc = CD3DX12_RESOURCE_DESC::Buffer(m_sz);
size_t reqSz = GetRequiredIntermediateSize(ctx->m_dev.Get(), &m_gpuDesc, 0, 1);
@@ -109,7 +109,7 @@ class D3D12GraphicsBufferD : public IGraphicsBufferD
size_t m_mappedSz;
void* m_mappedBuf = nullptr;
D3D12GraphicsBufferD(D3D12CommandQueue* q, BufferUse use, D3D12Context* ctx, size_t stride, size_t count)
: m_state(USE_TABLE[use]), m_q(q), m_stride(stride), m_count(count)
: m_state(USE_TABLE[int(use)]), m_q(q), m_stride(stride), m_count(count)
{
size_t sz = stride * count;
D3D12_RESOURCE_DESC desc = CD3DX12_RESOURCE_DESC::Buffer(sz);
@@ -373,12 +373,12 @@ struct D3D12VertexFormat : IVertexFormat
{
const VertexElementDescriptor* elemin = &elements[i];
D3D12_INPUT_ELEMENT_DESC& elem = m_elements[i];
elem.SemanticName = SEMANTIC_NAME_TABLE[elemin->semantic];
elem.SemanticName = SEMANTIC_NAME_TABLE[int(elemin->semantic)];
elem.SemanticIndex = elemin->semanticIdx;
elem.Format = SEMANTIC_TYPE_TABLE[elemin->semantic];
elem.Format = SEMANTIC_TYPE_TABLE[int(elemin->semantic)];
elem.AlignedByteOffset = offset;
elem.InputSlotClass = D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA;
offset += SEMANTIC_SIZE_TABLE[elemin->semantic];
offset += SEMANTIC_SIZE_TABLE[int(elemin->semantic)];
}
}
};
@@ -410,11 +410,11 @@ class D3D12ShaderPipeline : public IShaderPipeline
desc.VS = {vert->GetBufferPointer(), vert->GetBufferSize()};
desc.PS = {pixel->GetBufferPointer(), pixel->GetBufferSize()};
desc.BlendState = CD3DX12_BLEND_DESC(D3D12_DEFAULT);
if (dstFac != BlendFactorZero)
if (dstFac != BlendFactor::Zero)
{
desc.BlendState.RenderTarget[0].BlendEnable = true;
desc.BlendState.RenderTarget[0].SrcBlend = BLEND_FACTOR_TABLE[srcFac];
desc.BlendState.RenderTarget[0].DestBlend = BLEND_FACTOR_TABLE[dstFac];
desc.BlendState.RenderTarget[0].SrcBlend = BLEND_FACTOR_TABLE[int(srcFac)];
desc.BlendState.RenderTarget[0].DestBlend = BLEND_FACTOR_TABLE[int(dstFac)];
}
desc.RasterizerState = CD3DX12_RASTERIZER_DESC(D3D12_DEFAULT);
if (!backfaceCulling)
@@ -456,9 +456,9 @@ static UINT64 PlaceBufferForGPU(IGraphicsBuffer* buf, D3D12Context* ctx, ID3D12H
static UINT64 PlaceTextureForGPU(ITexture* tex, D3D12Context* ctx, ID3D12Heap* gpuHeap, UINT64 offset)
{
if (tex->type() == ITexture::TextureDynamic)
if (tex->type() == TextureType::Dynamic)
return static_cast<D3D12TextureD*>(tex)->placeForGPU(ctx, gpuHeap, offset);
else if (tex->type() == ITexture::TextureStatic)
else if (tex->type() == TextureType::Static)
return static_cast<D3D12TextureS*>(tex)->placeForGPU(ctx, gpuHeap, offset);
return offset;
}
@@ -526,12 +526,12 @@ static ID3D12Resource* GetBufferGPUResource(const IGraphicsBuffer* buf, int idx,
static ID3D12Resource* GetTextureGPUResource(const ITexture* tex, int idx)
{
if (tex->type() == ITexture::TextureDynamic)
if (tex->type() == TextureType::Dynamic)
{
const D3D12TextureD* ctex = static_cast<const D3D12TextureD*>(tex);
return ctex->m_gpuTexs[0].Get();
}
else if (tex->type() == ITexture::TextureStatic)
else if (tex->type() == TextureType::Static)
{
const D3D12TextureS* ctex = static_cast<const D3D12TextureS*>(tex);
return ctex->m_gpuTex.Get();
@@ -651,7 +651,7 @@ static ID3D12GraphicsCommandList* WaitForLoadList(D3D12Context* ctx)
struct D3D12CommandQueue : IGraphicsCommandQueue
{
Platform platform() const {return IGraphicsDataFactory::PlatformD3D12;}
Platform platform() const {return IGraphicsDataFactory::Platform::D3D12;}
const SystemChar* platformName() const {return _S("D3D12");}
D3D12Context* m_ctx;
D3D12Context::Window* m_windowCtx;
@@ -762,9 +762,9 @@ struct D3D12CommandQueue : IGraphicsCommandQueue
void setDrawPrimitive(Primitive prim)
{
if (prim == PrimitiveTriangles)
if (prim == Primitive::Triangles)
m_cmdList->IASetPrimitiveTopology(D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
else if (prim == PrimitiveTriStrips)
else if (prim == Primitive::TriStrips)
m_cmdList->IASetPrimitiveTopology(D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
}
@@ -1005,7 +1005,7 @@ public:
}
~D3D12DataFactory() = default;
Platform platform() const {return PlatformD3D12;}
Platform platform() const {return Platform::D3D12;}
const SystemChar* platformName() const {return _S("D3D12");}
IGraphicsBufferS* newStaticBuffer(BufferUse use, const void* data, size_t stride, size_t count)