Merge branch 'master' into d3d12

2019-05-12 07:48:18 -05:00
parent f54dddee90 2c1a28734e
commit 6789873620
8 changed files with 28 additions and 13 deletions
--- a/premake5.lua
+++ b/premake5.lua
@@ -207,9 +207,6 @@ if not os.isdir("scratch") then
  flags_file:write("#--flush_stdout=false\n")
  flags_file:write("\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_stream\n")
  flags_file:write("#--disable_framebuffer_readback\n")