izackp/Apollo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Warn when VideoProcessorSetStreamAlpha isn't supported

Browse Source
This commit is contained in:
loki
2021-04-28 13:44:42 +02:00
parent 1be5b4787f
commit fe8c2ceab9
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sunshine/platform/windows/display_vram.cpp
+13 -6
View File
@@ -99,6 +99,7 @@ util::buffer_t<std::uint8_t> make_cursor_image(util::buffer_t<std::uint8_t> &&im
class hwdevice_t : public platf::hwdevice_t { class hwdevice_t : public platf::hwdevice_t {
public: public:
hwdevice_t(std::vector<hwdevice_t*> *hwdevices_p) : hwdevices_p { hwdevices_p } {} hwdevice_t(std::vector<hwdevice_t*> *hwdevices_p) : hwdevices_p { hwdevices_p } {}
hwdevice_t() = delete; hwdevice_t() = delete;
@@ -168,8 +169,8 @@ public:
auto &processor_in = it->second; auto &processor_in = it->second;
D3D11_VIDEO_PROCESSOR_STREAM stream[] { D3D11_VIDEO_PROCESSOR_STREAM stream[] {
{ TRUE, 0, 0, 0, 0, nullptr, processor_in.get(), nullptr }, { TRUE, 0, 0, 0, 0, nullptr, processor_in.get() },
{ TRUE, 0, 0, 0, 0, nullptr, cursor_in.get(), nullptr } { TRUE, 0, 0, 0, 0, nullptr, cursor_in.get() }
}; };
auto status = ctx->VideoProcessorBlt(processor.get(), processor_out.get(), 0, cursor_visible ? 2 : 1, stream); auto status = ctx->VideoProcessorBlt(processor.get(), processor_out.get(), 0, cursor_visible ? 2 : 1, stream);
@@ -233,6 +234,12 @@ public:
} }
processor_e.reset(vp_e_p); processor_e.reset(vp_e_p);
D3D11_VIDEO_PROCESSOR_CAPS proc_caps;
processor_e->GetVideoProcessorCaps(&proc_caps);
if(!(proc_caps.FeatureCaps & D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_ALPHA_STREAM)) {
BOOST_LOG(warning) << "VideoProcessorSetStreamAlpha() not supported, hardware accelerated mouse cannot be added to the video stream"sv;
}
video::processor_t::pointer processor_p; video::processor_t::pointer processor_p;
status = device->CreateVideoProcessor(processor_e.get(), 0, &processor_p); status = device->CreateVideoProcessor(processor_e.get(), 0, &processor_p);
if(FAILED(status)) { if(FAILED(status)) {
@@ -241,6 +248,9 @@ public:
} }
processor.reset(processor_p); processor.reset(processor_p);
// Tell video processor alpha values need to be enabled
ctx->VideoProcessorSetStreamAlpha(processor.get(), 1, TRUE, 1.0f);
D3D11_TEXTURE2D_DESC t {}; D3D11_TEXTURE2D_DESC t {};
t.Width = out_width; t.Width = out_width;
t.Height = out_height; t.Height = out_height;
@@ -275,9 +285,6 @@ public:
} }
processor_out.reset(processor_out_p); processor_out.reset(processor_out_p);
// Tell video processor alpha values need to be enabled
ctx->VideoProcessorSetStreamAlpha(processor.get(), 1, TRUE, 1.0f);
device_p->AddRef(); device_p->AddRef();
data = device_p; data = device_p;
return 0; return 0;
@@ -373,7 +380,7 @@ capture_e display_vram_t::snapshot(platf::img_t *img_base, std::chrono::millisec
dxgi::texture2d_t::pointer tex_p {}; dxgi::texture2d_t::pointer tex_p {};
auto status = device->CreateTexture2D(&t, &data, &tex_p); auto status = device->CreateTexture2D(&t, &data, &tex_p);
if(FAILED(status)) { if(FAILED(status)) {
BOOST_LOG(error) << "Failed to create dummy texture [0x"sv << util::hex(status).to_string_view() << ']'; BOOST_LOG(error) << "Failed to create mouse texture [0x"sv << util::hex(status).to_string_view() << ']';
return capture_e::error; return capture_e::error;
} }
texture2d_t texture { tex_p }; texture2d_t texture { tex_p };
sunshine/platform/windows/input.cpp
+2 -2
View File
@@ -188,7 +188,7 @@ retry:
} }
void button_mouse(input_t &input, int button, bool release) { void button_mouse(input_t &input, int button, bool release) {
constexpr SHORT KEY_STATE_DOWN = 0x8000; constexpr auto KEY_STATE_DOWN = (SHORT)0x8000;
INPUT i {}; INPUT i {};
@@ -370,7 +370,7 @@ HDESK pairInputDesktop() {
} }
return hDesk; return hDesk;
}; }
void freeInput(void *p) { void freeInput(void *p) {
auto vigem = (vigem_t*)p; auto vigem = (vigem_t*)p;