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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

tools.shader: simplify, remove redundancies #20161

Merged
merged 2 commits into from
Dec 13, 2023
Merged

tools.shader: simplify, remove redundancies #20161

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1468d97
simplify shdc_exe part1
ttytm Dec 12, 2023
3b79958
simplify shdc / shdc_exe part 2, remove redundancies
ttytm Dec 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
39 changes: 13 additions & 26 deletions cmd/tools/vshader.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,7 @@ const shdc_urls = {
'osx_a64': 'https://github.com/floooh/sokol-tools-bin/raw/${shdc_full_hash}/bin/osx_arm64/sokol-shdc'
}
const shdc_version_file = os.join_path(cache_dir, 'sokol-shdc.version')
const shdc = shdc_exe()
const shdc_exe_name = 'sokol-shdc.exe'
const shdc_exe = os.join_path(cache_dir, 'sokol-shdc.exe')

struct Options {
show_help bool
Expand Down Expand Up @@ -192,7 +191,7 @@ fn compile_shader(opt CompileOptions, shader_file string) ! {
}

cmd :=
'${os.quoted_path(shdc)} --input ${os.quoted_path(shader_file)} --output ${os.quoted_path(out_file)} --slang ' +
'${os.quoted_path(shdc_exe)} --input ${os.quoted_path(shader_file)} --output ${os.quoted_path(out_file)} --slang ' +
os.quoted_path(slangs.join(':'))
if opt.verbose {
eprintln('${tool_name} executing:\n${cmd}')
Expand Down Expand Up @@ -238,18 +237,18 @@ fn ensure_external_tools(opt Options) ! {
return
}

is_shdc_available := os.is_file(shdc)
is_shdc_executable := os.is_executable(shdc)
is_shdc_available := os.is_file(shdc_exe)
is_shdc_executable := os.is_executable(shdc_exe)
if opt.verbose {
eprintln('reading version from ${shdc_version_file} ...')
version := os.read_file(shdc_version_file) or { 'unknown' }
eprintln('${tool_name} using sokol-shdc version ${version} at "${shdc}"')
eprintln('${tool_name} using sokol-shdc version ${version} at "${shdc_exe}"')
eprintln('executable: ${is_shdc_executable}')
eprintln(' available: ${is_shdc_available}')
if is_shdc_available {
eprintln(' file path: ${shdc}')
eprintln(' file size: ${os.file_size(shdc)}')
eprintln(' file time: ${time.unix_microsecond(os.file_last_mod_unix(shdc),
eprintln(' file path: ${shdc_exe}')
eprintln(' file size: ${os.file_size(shdc_exe)}')
eprintln(' file time: ${time.unix_microsecond(os.file_last_mod_unix(shdc_exe),
0)}')
}
}
Expand All @@ -260,13 +259,6 @@ fn ensure_external_tools(opt Options) ! {
download_shdc(opt)!
}

// shdc_exe returns an absolute path to the `sokol-shdc` tool.
// Please note that the tool isn't guaranteed to actually be present, nor is
// it guaranteed that it can be invoked.
fn shdc_exe() string {
return os.join_path(cache_dir, shdc_exe_name)
}

// download_shdc downloads the `sokol-shdc` tool to an OS specific cache directory.
fn download_shdc(opt Options) ! {
// We want to use the same, runtime, OS type as this tool is invoked on.
Expand All @@ -284,19 +276,18 @@ fn download_shdc(opt Options) ! {
if opt.verbose {
eprintln('> update_to_shdc_version: ${update_to_shdc_version} | shdc_version: ${shdc_version}')
}
file := shdc_exe()
if opt.verbose {
if shdc_version != update_to_shdc_version && os.exists(file) {
if shdc_version != update_to_shdc_version && os.exists(shdc_exe) {
eprintln('${tool_name} updating sokol-shdc to version ${shdc_version} ...')
} else {
eprintln('${tool_name} installing sokol-shdc version ${update_to_shdc_version} ...')
}
}
if os.exists(file) {
os.rm(file)!
if os.exists(shdc_exe) {
os.rm(shdc_exe)!
}

mut dtmp_file, dtmp_path := util.temp_file(util.TempFileOptions{ path: os.dir(file) })!
mut dtmp_file, dtmp_path := util.temp_file(util.TempFileOptions{ path: os.dir(shdc_exe) })!
dtmp_file.close()
if opt.verbose {
eprintln('${tool_name} downloading sokol-shdc from ${download_url}')
Expand All @@ -308,11 +299,7 @@ fn download_shdc(opt Options) ! {
// Make it executable
os.chmod(dtmp_path, 0o775)!
// Move downloaded file in place
os.mv(dtmp_path, file)!
if runtime_os in ['linux', 'macos'] {
// Use the .exe file ending to minimize platform friction.
os.mv(file, shdc)!
}
os.mv(dtmp_path, shdc_exe)!
// Update internal version file
os.write_file(shdc_version_file, shdc_version)!
}