Skip to content

fix python 2 iteritems() to use items() part of python3 migration #84

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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Ikreb1 merged 1 commit into from
Sep 3, 2026
Merged

fix python 2 iteritems() to use items() part of python3 migration #84

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions shadercompiler/python/shadercompiler/compiler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

BUILDER_DIR = os.path.dirname(os.path.abspath(__file__))


def _find_branch_dir(start):
directory = start
while True:
Expand All @@ -17,16 +18,19 @@ def _find_branch_dir(start):
directory = parent
raise RuntimeError('could not locate carbon.json in any parent of %s' % start)


BRANCH_DIR = _find_branch_dir(BUILDER_DIR)

carbonjson = json.load(open(os.path.join(BRANCH_DIR, 'carbon.json')))

SHADER_COMPILER_PATH = os.path.join(BRANCH_DIR, "vendor", carbonjson['libraries']['carbon_trinity'], "shadercompiler", "bin")
SHADER_COMPILER_PATH = os.path.join(BRANCH_DIR, "vendor", carbonjson['libraries']['carbon_trinity'], "shadercompiler",
"bin")

if sys.platform == 'win32':
COMPILER_PATH = os.path.abspath(os.path.join(SHADER_COMPILER_PATH, 'Windows', 'x64', 'v141', 'ShaderCompiler.exe'))
elif sys.platform == 'darwin':
COMPILER_PATH = os.path.abspath(os.path.join(SHADER_COMPILER_PATH, 'macOS', 'universal', 'AppleClang', 'ShaderCompiler'))
COMPILER_PATH = os.path.abspath(
os.path.join(SHADER_COMPILER_PATH, 'macOS', 'universal', 'AppleClang', 'ShaderCompiler'))
else:
raise RuntimeError('unsupported platform')

Expand Down Expand Up @@ -59,7 +63,7 @@ def compile_shader(effect_path, output_path=None, platform=None, shader_model=No
args.extend(('/define', 'PLATFORM', str(platform)))
if shader_model is not None:
args.extend(('/define', 'SHADERMODEL', str(shader_model)))
for name, value in (defines or {}).iteritems():
for name, value in (defines or {}).items():
args.extend(('/define', name, str(value)))
if avoid_flow_control:
args.append('/Gfa')
Expand Down