nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1787182 [Linux] Build and run VA-API test on MOZ_WAYLAND builds only r=emilio

Browse source 
Depends on D175236

Differential Revision: https://phabricator.services.mozilla.com/D175323
This commit is contained in:
stransky 2023-04-13 09:49:59 +00:00
parent 4337c6c266
commit aa94035b7c
3 changed files with 9 additions and 3 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

4
browser/installer/package-manifest.in
View file

@ -104,12 +104,12 @@
#endif #endif
#endif #endif
#ifdef MOZ_GTK #ifdef MOZ_GTK
@BINPATH@/glxtest
@BINPATH@/@DLL_PREFIX@mozgtk@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@mozgtk@DLL_SUFFIX@
#ifdef MOZ_WAYLAND #ifdef MOZ_WAYLAND
@BINPATH@/@DLL_PREFIX@mozwayland@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@mozwayland@DLL_SUFFIX@
#endif
@BINPATH@/vaapitest @BINPATH@/vaapitest
@BINPATH@/glxtest #endif
#endif #endif
; We don't have a complete view of which dlls to expect when doing an artifact ; We don't have a complete view of which dlls to expect when doing an artifact

6
widget/gtk/GfxInfo.cpp
View file

@ -554,7 +554,8 @@ void GfxInfo::GetData() {
AddCrashReportAnnotations(); AddCrashReportAnnotations();
} }
int fire_vaapi_process(const char* aRenderDevicePath, int* aOutPipe) { #ifdef MOZ_WAYLAND
static int fire_vaapi_process(const char* aRenderDevicePath, int* aOutPipe) {
nsCOMPtr<nsIFile> appFile; nsCOMPtr<nsIFile> appFile;
nsresult rv = XRE_GetBinaryPath(getter_AddRefs(appFile)); nsresult rv = XRE_GetBinaryPath(getter_AddRefs(appFile));
if (NS_FAILED(rv)) { if (NS_FAILED(rv)) {
@ -705,6 +706,7 @@ void GfxInfo::GetDataVAAPI() {
} }
} }
} }
#endif
const nsTArray<GfxDriverInfo>& GfxInfo::GetGfxDriverInfo() { const nsTArray<GfxDriverInfo>& GfxInfo::GetGfxDriverInfo() {
if (!sDriverInfo->Length()) { if (!sDriverInfo->Length()) {
@ -1132,7 +1134,9 @@ nsresult GfxInfo::GetFeatureStatusImpl(
// Probe VA-API on supported devices only // Probe VA-API on supported devices only
if (aFeature == nsIGfxInfo::FEATURE_HARDWARE_VIDEO_DECODING && if (aFeature == nsIGfxInfo::FEATURE_HARDWARE_VIDEO_DECODING &&
*aStatus == nsIGfxInfo::FEATURE_STATUS_OK) { *aStatus == nsIGfxInfo::FEATURE_STATUS_OK) {
#ifdef MOZ_WAYLAND
GetDataVAAPI(); GetDataVAAPI();
#endif
if (!mIsVAAPISupported.value()) { if (!mIsVAAPISupported.value()) {
*aStatus = nsIGfxInfo::FEATURE_BLOCKED_PLATFORM_TEST; *aStatus = nsIGfxInfo::FEATURE_BLOCKED_PLATFORM_TEST;
aFailureId = "FEATURE_FAILURE_VIDEO_DECODING_TEST_FAILED"; aFailureId = "FEATURE_FAILURE_VIDEO_DECODING_TEST_FAILED";

2
widget/gtk/GfxInfo.h
View file

@ -114,7 +114,9 @@ class GfxInfo final : public GfxInfoBase {
bool mGlxTestError; bool mGlxTestError;
mozilla::Maybe<bool> mIsVAAPISupported; mozilla::Maybe<bool> mIsVAAPISupported;
#ifdef MOZ_WAYLAND
void GetDataVAAPI(); void GetDataVAAPI();
#endif
void AddCrashReportAnnotations(); void AddCrashReportAnnotations();
}; };