Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-22 13:37:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[host] don't uselessly try to scale 1:1 textures

Browse Source
This commit is contained in:
Geoffrey McRae 2018-07-28 10:25:16 +10:00
parent 05bd587c74
commit f692284f27
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
host/TextureConverter.cpp
View File

@ -65,9 +65,9 @@ bool TextureConverter::Initialize(
{ {
case FRAME_TYPE_YUV420: case FRAME_TYPE_YUV420:
result = device->CreatePixelShader(g_RGBtoYUV, sizeof(g_RGBtoYUV), NULL, &m_psConversion); result = device->CreatePixelShader(g_RGBtoYUV, sizeof(g_RGBtoYUV), NULL, &m_psConversion);
m_texFormats[0] = DXGI_FORMAT_R8_UNORM; m_scaleFormats[0] = 1.0f; m_texFormats[0] = DXGI_FORMAT_R8_UNORM; m_scaleFormats[0] = 1;
m_texFormats[1] = DXGI_FORMAT_R8_UNORM; m_scaleFormats[1] = 0.5f; m_texFormats[1] = DXGI_FORMAT_R8_UNORM; m_scaleFormats[1] = 2;
m_texFormats[2] = DXGI_FORMAT_R8_UNORM; m_scaleFormats[2] = 0.5f; m_texFormats[2] = DXGI_FORMAT_R8_UNORM; m_scaleFormats[2] = 2;
break; break;
default: default:
@ -369,9 +369,16 @@ bool TextureConverter::Convert(ID3D11Texture2DPtr texture, TextureList & output)
ID3D11RenderTargetViewPtr view; ID3D11RenderTargetViewPtr view;
D3D11_TEXTURE2D_DESC srcDesc; D3D11_TEXTURE2D_DESC srcDesc;
// if there is no scaling
if (m_scaleFormats[i] == 1)
{
output.push_back(src);
continue;
}
src->GetDesc(&srcDesc); src->GetDesc(&srcDesc);
viewPorts[0].Width = srcDesc.Width * m_scaleFormats[i]; viewPorts[0].Width = srcDesc.Width / m_scaleFormats[i];
viewPorts[0].Height = srcDesc.Height * m_scaleFormats[i]; viewPorts[0].Height = srcDesc.Height / m_scaleFormats[i];
srcDesc.Width = (UINT)viewPorts[0].Width; srcDesc.Width = (UINT)viewPorts[0].Width;
srcDesc.Height = (UINT)viewPorts[0].Height; srcDesc.Height = (UINT)viewPorts[0].Height;

2
host/TextureConverter.h
View File

@ -60,7 +60,7 @@ private:
FrameType m_format; FrameType m_format;
DXGI_FORMAT m_texFormats [3]; DXGI_FORMAT m_texFormats [3];
float m_scaleFormats [3]; unsigned int m_scaleFormats [3];
ID3D11Texture2DPtr m_targetTexture[3]; ID3D11Texture2DPtr m_targetTexture[3];
ID3D11RenderTargetViewPtr m_renderView [3]; ID3D11RenderTargetViewPtr m_renderView [3];