Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2025-08-05 18:24:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[host] all: pass back the desktop rotation to the client

Browse Source
This commit is contained in:
Geoffrey McRae
2021-01-18 13:53:29 +11:00
parent 842bb59955
commit f5587b6b6b
6 changed files with 104 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
host/platform/Windows/capture/DXGI/src/dxgi.c
View File

@@ -93,13 +93,14 @@ struct iface
CapturePostPointerBuffer postPointerBufferFn;
LGEvent * frameEvent;
unsigned int formatVer;
unsigned int width;
unsigned int height;
unsigned int pitch;
unsigned int stride;
CaptureFormat format;
unsigned int dpi;
unsigned int formatVer;
unsigned int width;
unsigned int height;
unsigned int pitch;
unsigned int stride;
CaptureFormat format;
CaptureRotation rotation;
unsigned int dpi;
int lastPointerX, lastPointerY;
bool lastPointerVisible;
@@ -371,9 +372,46 @@ static bool dxgi_init(void)
DXGI_ADAPTER_DESC1 adapterDesc;
IDXGIAdapter1_GetDesc1(this->adapter, &adapterDesc);
this->width = outputDesc.DesktopCoordinates.right - outputDesc.DesktopCoordinates.left;
this->height = outputDesc.DesktopCoordinates.bottom - outputDesc.DesktopCoordinates.top;
this->dpi = monitor_dpi(outputDesc.Monitor);
switch(outputDesc.Rotation)
{
case DXGI_MODE_ROTATION_ROTATE90:
case DXGI_MODE_ROTATION_ROTATE270:
this->width = outputDesc.DesktopCoordinates.bottom -
outputDesc.DesktopCoordinates.top;
this->height = outputDesc.DesktopCoordinates.right -
outputDesc.DesktopCoordinates.left;
break;
default:
this->width = outputDesc.DesktopCoordinates.right -
outputDesc.DesktopCoordinates.left;
this->height = outputDesc.DesktopCoordinates.bottom -
outputDesc.DesktopCoordinates.top;
break;
}
switch(outputDesc.Rotation)
{
case DXGI_MODE_ROTATION_ROTATE90:
this->rotation = CAPTURE_ROT_90;
break;
case DXGI_MODE_ROTATION_ROTATE180:
this->rotation = CAPTURE_ROT_180;
break;
case DXGI_MODE_ROTATION_ROTATE270:
this->rotation = CAPTURE_ROT_270;
break;
default:
this->rotation = CAPTURE_ROT_0;
break;
}
this->dpi = monitor_dpi(outputDesc.Monitor);
++this->formatVer;
DEBUG_INFO("Device Descripion: %ls" , adapterDesc.Description);
@@ -928,6 +966,7 @@ static CaptureResult dxgi_waitFrame(CaptureFrame * frame)
frame->pitch = this->pitch;
frame->stride = this->stride;
frame->format = this->format;
frame->rotation = this->rotation;
atomic_fetch_sub_explicit(&this->texReady, 1, memory_order_release);
return CAPTURE_RESULT_OK;

1
host/platform/Windows/capture/NVFBC/src/nvfbc.c
View File

@@ -312,6 +312,7 @@ static CaptureResult nvfbc_waitFrame(CaptureFrame * frame)
frame->height = this->grabHeight;
frame->pitch = this->grabStride * 4;
frame->stride = this->grabStride;
frame->rotation = CAPTURE_ROT_0;
#if 0
//NvFBC never sets bIsHDR so instead we check for any data in the alpha channel