From db5aca1ab5e846d4f91cc24889ec763ad4c0b83f Mon Sep 17 00:00:00 2001 From: jp9000 Date: Sun, 10 Nov 2013 06:31:55 -0700 Subject: [PATCH] fixed some D3D macros --- libobs-d3d11/d3d11-subsystem.cpp | 2 +- libobs-d3d11/d3d11-texture2d.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libobs-d3d11/d3d11-subsystem.cpp b/libobs-d3d11/d3d11-subsystem.cpp index 7f67d3b77..a6aa383d6 100644 --- a/libobs-d3d11/d3d11-subsystem.cpp +++ b/libobs-d3d11/d3d11-subsystem.cpp @@ -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; diff --git a/libobs-d3d11/d3d11-texture2d.cpp b/libobs-d3d11/d3d11-texture2d.cpp index 9ef6c2b93..c5e9b81e4 100644 --- a/libobs-d3d11/d3d11-texture2d.cpp +++ b/libobs-d3d11/d3d11-texture2d.cpp @@ -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; }