Skip to content

Conversation

@jloehr
Copy link
Contributor

@jloehr jloehr commented Sep 20, 2024

Description

root doesn't has a trailing slash, so on Android a folder named filesoutput/ was created instead of files/output/.
This PR adds the missing directory separator when creating folders.

General Checklist:

Please ensure the following points are checked:

  • My code follows the coding style
  • I have reviewed file licenses
  • I have commented any added functions (in line with Doxygen)
  • I have commented any code that could be hard to understand
  • My changes do not add any new compiler warnings
  • My changes do not add any new validation layer errors or warnings
  • I have used existing framework/helper functions where possible
  • My changes do not add any regressions
  • I have tested every sample to ensure everything runs correctly
  • This PR describes the scope and expected impact of the changes I am making

Note: The Samples CI runs a number of checks including:

  • I have updated the header Copyright to reflect the current year (CI build will fail if Copyright is out of date)
  • My changes build on Windows, Linux, macOS and Android. Otherwise I have documented any exceptions

If this PR contains framework changes:

  • I did a full batch run using the batch command line argument to make sure all samples still work properly

@CLAassistant
Copy link

CLAassistant commented Sep 20, 2024

CLA assistant check
All committers have signed the CLA.

@asuessenbach
Copy link
Contributor

Under what circumstances do you get root without a trailing slash?
Maybe this function should be able handle both cases, root with and without a trailing slash.

@jloehr
Copy link
Contributor Author

jloehr commented Sep 23, 2024

Under Android fs->external_storage_directory().string() (which is passed into create_path as root) returns something along /data/data/com.khronos.vulkan_samples/files (don't have the exact path at hand now) without the trailing space.

create_path(fs->external_storage_directory().string(), it->second);
seems to be the only place where create_path is called. We ran samples with that change on Android, Windows and Linux and didn't encounter any issues.

Maybe we can replace it with std::filesystem::create_directories altogether. Though haven't tested that. We ran with the simple added slash.

@marty-johnson59
Copy link
Contributor

Hi @tomadamatkinson, can you take a quick look here? Looks reasonable, but wanted to double check with you before merging. Thanks

@tomadamatkinson
Copy link
Contributor

tomadamatkinson commented Nov 4, 2024

Hey @jloehr, this approach likely works, but I was a little unsure if this would affect other platforms.

Maybe we can replace it with std::filesystem::create_directories altogether. Though haven't tested that. We ran with the simple added slash.

I think this is a great suggestion! It also pointed out some bugs that we could have had with vkb::fs in the long run. I also didn't know how the standard library would behave so i added some tests in here too. Please take a look at #1214 as an alternative approach

That said i am happy with either PR to merge :)

@marty-johnson59
Copy link
Contributor

Merging w/ Tom's approval - per discussion on Monday's call - LMK if this causes issues and we can revert

@marty-johnson59 marty-johnson59 merged commit 6f99ebe into KhronosGroup:main Nov 6, 2024
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.

6 participants