Skip to content

Conversation

@ImperatorS79
Copy link
Contributor

Simply download the latest DXVK build and install it. Can be useful for some game in terms of performance, but should remain an option (for compatibility)

@ImperatorS79 ImperatorS79 changed the title Added DXVK Added DXVK verb Mar 19, 2018
@plata
Copy link
Collaborator

plata commented Mar 20, 2018

Cannot merge before #511.

Wine 3.5 is including vulkan-1.dll, so vulkanSDK from LunarG is now only needed for debugging purposes :).
@ImperatorS79
Copy link
Contributor Author

ImperatorS79 commented Mar 30, 2018

This can now be committed ;).


remove(this.prefixDirectory + "/TMP/");

return this;
Copy link
Collaborator

Choose a reason for hiding this comment

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

Something seems to be wrong with the indentation here (remove... is indented more than return). Usually Codacy should complain about this. Please merge the latest master to see if the error is detected then. If not, I would like to update Codacy to detect this first (so don't fix it yet).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Check successful...

print("NOTE: wine version should be greater or equal to 3.5");

var setupFile = new Resource()
.wizard(this._wizard)
Copy link
Collaborator

Choose a reason for hiding this comment

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

better use this.wizard()

.get();

var setupExtracted = new Extractor()
.wizard(this._wizard)
Copy link
Collaborator

Choose a reason for hiding this comment

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

see above

@plata
Copy link
Collaborator

plata commented Mar 31, 2018

The indentation is still not the same everywhere. Let me try to check this in Codacy.

@plata
Copy link
Collaborator

plata commented Mar 31, 2018

I will fix the indentation detection in #539.

@ImperatorS79
Copy link
Contributor Author

ImperatorS79 commented Apr 8, 2018

Is it possible to execute a .sh in a verb ? So that I will use the setup_dxvk.sh inside the archive to be sure evrything goes where it should.

Ex (from dxvk):

cd /your/dxvk/directory/bin
WINEPREFIX=/your/wineprefix bash setup_dxvk.sh

@plata
Copy link
Collaborator

plata commented Apr 8, 2018

You can use the Java ProcessBuilder.

@ImperatorS79
Copy link
Contributor Author

Won't need it after all, this is ready to be commit I think.

@plata
Copy link
Collaborator

plata commented Apr 8, 2018

I have updated the ESLint configuration on master. Please update so Codacy uses the up-to-date config. Moreover, we have added script.json for the Verbs, so please add that as well.

@plata
Copy link
Collaborator

plata commented Apr 8, 2018

I will review as soon as master is merged and all status checks have passed.

@plata
Copy link
Collaborator

plata commented Apr 8, 2018

The merge you did there doesn't seem to have worked properly. At least it doesn't show any changes.

@ImperatorS79
Copy link
Contributor Author

I do not understand. Why should there be any changes in this pull if the only things I am modifying are the script.js and script.json file ?

@plata
Copy link
Collaborator

plata commented Apr 8, 2018

You're right. I looked at the merge commit but of course GitHub shows only the changes compared to master if I do not click "show diff"...

@@ -0,0 +1,50 @@
include(["Engines", "Wine", "Engine", "Object"]);
Copy link
Collaborator

Choose a reason for hiding this comment

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

The includes are wrong. We have changed the IDs to all lower case (so e.g. "engines" instead of "Engines").

include(["Utils", "Functions", "Filesystem", "Files"]);

/**
* Setup DXVK-> https://github.com/doitsujin/dxvk/
Copy link
Collaborator

Choose a reason for hiding this comment

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

Please use the same JSDoc comment style as the other Verbs.

}

this.overrideDLL()
.set("native", ["d3d11"])
Copy link
Collaborator

Choose a reason for hiding this comment

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

I think you can do the overrideDLL in one call.

@ImperatorS79
Copy link
Contributor Author

I do not understand where are those "trailing spaces"

@plata
Copy link
Collaborator

plata commented Apr 8, 2018

For example in l. 17 there's a space behind .get();.

@plata
Copy link
Collaborator

plata commented Apr 8, 2018

Btw: If you install eslint on your PC, you can fix this kind of errors automatically with

eslint -c .eslintrc.yml --fix ./**/*.js

@plata plata merged commit 01ac2b2 into PhoenicisOrg:master Apr 8, 2018
@ImperatorS79 ImperatorS79 deleted the DXVK branch April 9, 2018 15:25
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.

2 participants