griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: format

Browse Source
This commit is contained in:
Campbell Barton
2022-06-30 12:14:23 +10:00
parent b6c28002ac
commit feeb8310c8
8 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build_files/build_environment/cmake/download.cmake
View File

@@ -116,4 +116,3 @@ download_source(IGC_SPIRV_TOOLS)
download_source(IGC_SPIRV_TRANSLATOR)
download_source(GMMLIB)
download_source(OCLOC)

1
build_files/build_environment/cmake/dpcpp_deps.cmake
View File

@@ -59,4 +59,3 @@ ExternalProject_Add(external_spirvheaders
BUILD_COMMAND echo .
INSTALL_COMMAND echo .
)

1
build_files/build_environment/cmake/gmmlib.cmake
View File

@@ -11,4 +11,3 @@ ExternalProject_Add(external_gmmlib
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/gmmlib ${DEFAULT_CMAKE_FLAGS} ${GMMLIB_EXTRA_ARGS}
INSTALL_DIR ${LIBDIR}/gmmlib
)

2
build_files/build_environment/cmake/igc.cmake
View File

@@ -7,7 +7,7 @@ unpack_only(igc_spirv_tools)
#
# igc_opencl_clang contains patches that need to be applied
# to external_igc_llvm and igc_spirv_translator, we unpack
# igc_opencl_clang first, then have the patch stages of
# igc_opencl_clang first, then have the patch stages of
# external_igc_llvm and igc_spirv_translator apply them.
#

11
intern/cycles/blender/addon/properties.py
View File

@@ -1568,11 +1568,12 @@ class CyclesPreferences(bpy.types.AddonPreferences):
for device in devices:
import unicodedata
box.prop(device, "use", text=device.name
.replace('(TM)', unicodedata.lookup('TRADE MARK SIGN'))
.replace('(R)', unicodedata.lookup('REGISTERED SIGN'))
.replace('(C)', unicodedata.lookup('COPYRIGHT SIGN'))
)
box.prop(
device, "use", text=device.name
.replace('(TM)', unicodedata.lookup('TRADE MARK SIGN'))
.replace('(R)', unicodedata.lookup('REGISTERED SIGN'))
.replace('(C)', unicodedata.lookup('COPYRIGHT SIGN'))
)
def draw_impl(self, layout, context):
row = layout.row()

2
intern/cycles/blender/addon/ui.py
View File

@@ -110,11 +110,13 @@ def use_optix(context):
return (get_device_type(context) == 'OPTIX' and cscene.device == 'GPU')
def use_oneapi(context):
cscene = context.scene.cycles
return (get_device_type(context) == 'ONEAPI' and cscene.device == 'GPU')
def use_multi_device(context):
cscene = context.scene.cycles
if cscene.device != 'GPU':

2
source/blender/gpencil_modifiers/intern/lineart/lineart_chain.c
View File

@@ -1338,4 +1338,4 @@ void MOD_lineart_chain_find_silhouette_backdrop_objects(LineartData *ld)
ec->silhouette_backdrop = eln->object_ref;
}
}
}
}

26
tests/performance/tests/eevee.py
View File

@@ -29,10 +29,10 @@ def _run(args):
bpy.app.handlers.frame_change_post.append(frame_change_handler)
bpy.ops.screen.animation_play()
def frame_change_handler(scene):
import bpy
global record_stage
global start_time
global start_record_time
@@ -40,7 +40,7 @@ def frame_change_handler(scene):
global warmup_frame
global stop_record_time
global playback_iteration
if record_stage == RecordStage.INIT:
screen = bpy.context.window_manager.windows[0].screen
bpy.context.scene.sync_mode = 'NONE'
@@ -50,10 +50,10 @@ def frame_change_handler(scene):
space = area.spaces[0]
space.shading.type = 'RENDERED'
space.overlay.show_overlays = False
start_time = time.perf_counter()
record_stage = RecordStage.WAIT_SHADERS
elif record_stage == RecordStage.WAIT_SHADERS:
shaders_compiled = False
if hasattr(bpy.app, 'is_job_running'):
@@ -61,12 +61,12 @@ def frame_change_handler(scene):
else:
# Fallback when is_job_running doesn't exists by waiting for a time.
shaders_compiled = time.perf_counter() - start_time > SHADER_FALLBACK_SECONDS
if shaders_compiled:
start_warmup_time = time.perf_counter()
warmup_frame = 0
record_stage = RecordStage.WARMUP
elif record_stage == RecordStage.WARMUP:
warmup_frame += 1
if time.perf_counter() - start_warmup_time > WARMUP_SECONDS and warmup_frame > WARMUP_FRAMES:
@@ -75,13 +75,13 @@ def frame_change_handler(scene):
scene = bpy.context.scene
scene.frame_set(scene.frame_start)
record_stage = RecordStage.RECORD
elif record_stage == RecordStage.RECORD:
current_time = time.perf_counter()
scene = bpy.context.scene
if scene.frame_current == scene.frame_end:
playback_iteration += 1
if playback_iteration >= RECORD_PLAYBACK_ITER:
stop_record_time = current_time
record_stage = RecordStage.FINISHED
@@ -95,13 +95,14 @@ def frame_change_handler(scene):
print(f"{LOG_KEY}{{'time': {avg_frame_time}, 'fps': {fps} }}")
bpy.app.handlers.frame_change_post.remove(frame_change_handler)
bpy.ops.wm.quit_blender()
if __name__ == '__main__':
_run(None)
else:
import api
class EeveeTest(api.Test):
def __init__(self, filepath):
self.filepath = filepath
@@ -123,7 +124,6 @@ else:
raise Exception("No playback performance result found in log.")
def generate(env):
filepaths = env.find_blend_files('eevee/*')
return [EeveeTest(filepath) for filepath in filepaths]
return [EeveeTest(filepath) for filepath in filepaths]