jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed some D3D macros

master
jp9000 2013-11-10 06:31:55 -07:00
parent 388f25db05
commit db5aca1ab5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libobs-d3d11/d3d11-subsystem.cpp
View File

@ -1050,7 +1050,7 @@ void device_draw(device_t device, enum gs_draw_mode draw_mode,
return;
}
D3D10_PRIMITIVE_TOPOLOGY newTopology = ConvertGSTopology(draw_mode);
D3D11_PRIMITIVE_TOPOLOGY newTopology = ConvertGSTopology(draw_mode);
if (device->curToplogy != newTopology) {
device->context->IASetPrimitiveTopology(newTopology);
device->curToplogy = newTopology;

8
libobs-d3d11/d3d11-texture2d.cpp
View File

@ -61,7 +61,7 @@ void gs_texture_2d::InitTexture(const void **data)
td.MipLevels = genMipmaps ? 0 : levels;
td.ArraySize = type == GS_TEXTURE_CUBE ? 6 : 1;
td.Format = dxgiFormat;
td.BindFlags = D3D10_BIND_SHADER_RESOURCE;
td.BindFlags = D3D11_BIND_SHADER_RESOURCE;
td.SampleDesc.Count = 1;
td.CPUAccessFlags = isDynamic ? D3D11_CPU_ACCESS_WRITE : 0;
td.Usage = isDynamic ? D3D11_USAGE_DYNAMIC :
@ -71,7 +71,7 @@ void gs_texture_2d::InitTexture(const void **data)
td.MiscFlags |= D3D11_RESOURCE_MISC_TEXTURECUBE;
if (isRenderTarget || isGDICompatible)
td.BindFlags |= D3D10_BIND_RENDER_TARGET;
td.BindFlags |= D3D11_BIND_RENDER_TARGET;
if (data)
InitSRD(srd, data);
@ -91,10 +91,10 @@ void gs_texture_2d::InitResourceView()
resourceDesc.Format = dxgiFormat;
if (type == GS_TEXTURE_CUBE) {
resourceDesc.ViewDimension = D3D10_SRV_DIMENSION_TEXTURECUBE;
resourceDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURECUBE;
resourceDesc.TextureCube.MipLevels = genMipmaps ? -1 : 1;
} else {
resourceDesc.ViewDimension = D3D10_SRV_DIMENSION_TEXTURE2D;
resourceDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D;
resourceDesc.Texture2D.MipLevels = genMipmaps ? -1 : 1;
}