Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

winecommand: Fix LatencyFleX enablement #2993

Merged
merged 3 commits into from
Jul 30, 2023

Conversation

misyltoad
Copy link
Contributor

This is not a driver ICD...

This is not a driver ICD...
@github-actions
Copy link
Contributor

Pylint result on modfied files:
************* Module bottles.backend.wine.winecommand
bottles/backend/wine/winecommand.py:262:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/backend/wine/winecommand.py:483:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/backend/wine/winecommand.py:483:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/backend/wine/winecommand.py:583:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/backend/wine/winecommand.py:583:0: W1405: Quote delimiter ' is inconsistent with the rest of the file (inconsistent-quotes)
bottles/backend/wine/winecommand.py:84:4: R0913: Too many arguments (11/5) (too-many-arguments)
bottles/backend/wine/winecommand.py:128:12: W0105: String statement has no effect (pointless-string-statement)
bottles/backend/wine/winecommand.py:134:12: W0105: String statement has no effect (pointless-string-statement)
bottles/backend/wine/winecommand.py:166:8: C0103: Variable name "ld" doesn't conform to snake_case naming style (invalid-name)
bottles/backend/wine/winecommand.py:184:16: C0103: Variable name "e" doesn't conform to snake_case naming style (invalid-name)
bottles/backend/wine/winecommand.py:193:19: C0103: Variable name "v" doesn't conform to snake_case naming style (invalid-name)
bottles/backend/wine/winecommand.py:212:20: C0103: Variable name "ld" doesn't conform to snake_case naming style (invalid-name)
bottles/backend/wine/winecommand.py:360:24: C0103: Variable name "p" doesn't conform to snake_case naming style (invalid-name)
bottles/backend/wine/winecommand.py:367:20: W0105: String statement has no effect (pointless-string-statement)
bottles/backend/wine/winecommand.py:371:51: E1136: Value 'gpu['prime']['integrated']' is unsubscriptable (unsubscriptable-object)
bottles/backend/wine/winecommand.py:373:20: W0105: String statement has no effect (pointless-string-statement)
bottles/backend/wine/winecommand.py:165:8: W0612: Unused variable 'is_nvidia' (unused-variable)
bottles/backend/wine/winecommand.py:418:12: W0105: String statement has no effect (pointless-string-statement)
bottles/backend/wine/winecommand.py:428:12: W0105: String statement has no effect (pointless-string-statement)
bottles/backend/wine/winecommand.py:436:12: W0105: String statement has no effect (pointless-string-statement)
bottles/backend/wine/winecommand.py:483:32: R1732: Consider using 'with' for resource-allocating operations (consider-using-with)
bottles/backend/wine/winecommand.py:492:21: W1514: Using open without explicitly specifying an encoding (unspecified-encoding)
bottles/backend/wine/winecommand.py:492:49: C0103: Variable name "f" doesn't conform to snake_case naming style (invalid-name)
bottles/backend/wine/winecommand.py:499:21: W1514: Using open without explicitly specifying an encoding (unspecified-encoding)
bottles/backend/wine/winecommand.py:499:49: C0103: Variable name "f" doesn't conform to snake_case naming style (invalid-name)
bottles/backend/wine/winecommand.py:503:16: C0103: Variable name "st" doesn't conform to snake_case naming style (invalid-name)
bottles/backend/wine/winecommand.py:515:20: W0105: String statement has no effect (pointless-string-statement)
bottles/backend/wine/winecommand.py:583:12: C0103: Variable name "s" doesn't conform to snake_case naming style (invalid-name)
bottles/backend/wine/winecommand.py:585:12: C0103: Variable name "s" doesn't conform to snake_case naming style (invalid-name)
bottles/backend/wine/winecommand.py:593:8: R1732: Consider using 'with' for resource-allocating operations (consider-using-with)
bottles/backend/wine/winecommand.py:604:8: R1732: Consider using 'with' for resource-allocating operations (consider-using-with)
bottles/backend/wine/winecommand.py:641:12: R1705: Unnecessary "else" after "return", remove the "else" and de-indent the code inside it (no-else-return)
bottles/backend/wine/winecommand.py:679:8: C0103: Variable name "rv" doesn't conform to snake_case naming style (invalid-name)
bottles/backend/wine/winecommand.py:681:12: C0103: Variable name "rv" doesn't conform to snake_case naming style (invalid-name)
bottles/backend/wine/winecommand.py:687:12: C0103: Variable name "rv" doesn't conform to snake_case naming style (invalid-name)
bottles/backend/wine/winecommand.py:658:23: R1732: Consider using 'with' for resource-allocating operations (consider-using-with)
bottles/backend/wine/winecommand.py:707:17: W1514: Using open without explicitly specifying an encoding (unspecified-encoding)
bottles/backend/wine/winecommand.py:707:41: C0103: Variable name "f" doesn't conform to snake_case naming style (invalid-name)
bottles/backend/wine/winecommand.py:711:17: W1514: Using open without explicitly specifying an encoding (unspecified-encoding)
bottles/backend/wine/winecommand.py:711:41: C0103: Variable name "f" doesn't conform to snake_case naming style (invalid-name)
bottles/backend/wine/winecommand.py:713:17: W1514: Using open without explicitly specifying an encoding (unspecified-encoding)
bottles/backend/wine/winecommand.py:713:41: C0103: Variable name "f" doesn't conform to snake_case naming style (invalid-name)

@TheEvilSkeleton TheEvilSkeleton added this to the 52.0 milestone Jul 29, 2023
@orowith2os
Copy link
Contributor

Have you tested locally (via a flatpak bundle, either from here or a flatpak built locally) that this works?

@misyltoad
Copy link
Contributor Author

misyltoad commented Jul 29, 2023

I did not test in the Flatpak but I did on my host. It will work as long as the Flatpak (or it's runtimes) ship LatencyFleX. (Looks like it does here: https://github.com/bottlesdevs/Bottles/blob/main/com.usebottles.bottles.yml#L173)

Without this commit, LatencyFleX is being added as a driver ICD which is completely wrong, it is a Vulkan layer and the option is not correctly controlling whether the layer is enabled.

Copy link
Contributor

@orowith2os orowith2os left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Everything LGTM, and is in line with upstream behavior. Will test momentarily.

@orowith2os
Copy link
Contributor

I did not test in the Flatpak but I did on my host.

If you could test in Flatpak, that would be greatly appreciated. We don't support native packages at all, and if it only works there, this isn't something I think we're going to worry about.

@TheEvilSkeleton
Copy link
Contributor

It's our responsibility as maintainers to test it :p

That said, this is a proper fix and in-scope of what it's trying to achieve. If the LatencyFleX flatpak doesn't work then it's a packaging problem on our end; fixing that would make it out of scope of the MR.

@orowith2os orowith2os merged commit b4b9492 into bottlesdevs:main Jul 30, 2023
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants