ShuriZma
/
xenia-canary
mirror of https://github.com/xenia-canary/xenia-canary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1368 from Margen67/patch-3 

Fix/remove OpenGL leftovers
This commit is contained in:
Rick Gibbed 2019-05-08 10:35:08 -05:00 committed by GitHub
parent 00e061c4e4 24c290e8a9
commit 1ff50b7cd5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
premake5.lua
View File

@ -206,9 +206,6 @@ if not os.isdir("scratch") then
flags_file:write("#--flush_stdout=false\n") flags_file:write("#--flush_stdout=false\n")
flags_file:write("\n") flags_file:write("\n")
flags_file:write("#--vsync=false\n") flags_file:write("#--vsync=false\n")
flags_file:write("#--gl_debug\n")
flags_file:write("#--gl_debug_output\n")
flags_file:write("#--gl_debug_output_synchronous\n")
flags_file:write("#--trace_gpu_prefix=scratch/gpu/gpu_trace_\n") flags_file:write("#--trace_gpu_prefix=scratch/gpu/gpu_trace_\n")
flags_file:write("#--trace_gpu_stream\n") flags_file:write("#--trace_gpu_stream\n")
flags_file:write("#--disable_framebuffer_readback\n") flags_file:write("#--disable_framebuffer_readback\n")

2
tools/gpu-trace-diff
View File

@ -44,7 +44,7 @@ def main():
description='Run and diff GPU traces.') description='Run and diff GPU traces.')
parser.add_argument( parser.add_argument(
'-x', '--executable', '-x', '--executable',
default='build/bin/Windows/Debug/xenia-gpu-gl4-trace-dump.exe') default='build/bin/Windows/Debug/xenia-gpu-vulkan-trace-dump.exe')
parser.add_argument('-t', '--trace_file', action='append') parser.add_argument('-t', '--trace_file', action='append')
parser.add_argument('-p', '--trace_path') parser.add_argument('-p', '--trace_path')
parser.add_argument('-o', '--output_path', default='') parser.add_argument('-o', '--output_path', default='')

2
xenia-build
View File

@ -958,7 +958,7 @@ class GpuTestCommand(BaseBuildCommand):
# The test executables that will be built and run. # The test executables that will be built and run.
test_targets = args['target'] or [ test_targets = args['target'] or [
'xenia-gpu-gl4-trace-dump', 'xenia-gpu-vulkan-trace-dump',
] ]
args['target'] = test_targets args['target'] = test_targets