diff --git a/src/gp_dx12.c b/src/gp_dx12.c index 2765fc63..9c50946f 100644 --- a/src/gp_dx12.c +++ b/src/gp_dx12.c @@ -33,7 +33,7 @@ #pragma comment(lib, "dxguid") #pragma comment(lib, "d3dcompiler") -#if PROFILING_D3D +#if PROFILING_GPU /* For RegOpenKeyEx */ # include # pragma comment(lib, "advapi32") @@ -147,7 +147,7 @@ struct command_queue { struct command_list_pool *cl_pool; -#if PROFILING_D3D +#if PROFILING_GPU __prof_dx12_ctx(prof); #endif }; @@ -565,7 +565,7 @@ INTERNAL void dx12_init_device(void) } #endif -#if PROFILING_D3D +#if PROFILING_GPU && PROFILING_GPU_STABLE_POWER_STATE /* Enable stable power state */ { __profn("Set stable power state"); @@ -3308,7 +3308,7 @@ void gp_present(struct gp_swapchain *gp_swapchain, struct v2i32 backbuffer_resol } } -#if PROFILING_D3D +#if PROFILING_GPU { __profframe(0); diff --git a/src/prof_tracy.h b/src/prof_tracy.h index d68f31d9..2ce88309 100644 --- a/src/prof_tracy.h +++ b/src/prof_tracy.h @@ -10,7 +10,8 @@ #define PROFILING_SYSTEM_TRACE 0 #define PROFILING_CAPTURE_FRAME_IMAGE 0 #define PROFILING_LOCKS 0 -#define PROFILING_D3D 1 +#define PROFILING_GPU 1 +#define PROFILING_GPU_STABLE_POWER_STATE 1 //#define PROFILER_THREAD_AFFINITY_MASK 0x000000000000F000ull #define PROFILER_THREAD_AFFINITY_MASK 0 #define PROFILER_THREAD_PREFIX_WSTR L"Tracy" @@ -61,7 +62,7 @@ enum __prof_plot_type { #define PROFILING_CAPTURE_FRAME_IMAGE 0 #define PROFILING_LOCKS 0 -#define PROFILING_D3D 0 +#define PROFILING_GPU 0 #define __profnc(name, color) #define __profn(name) @@ -109,7 +110,7 @@ enum __prof_plot_type { # define __proflock_custom_name(ctx, name, len) #endif /* PROFILING && PROFILING_LOCKS */ -#if PROFILING_D3D +#if PROFILING_GPU /* Dx11 */ INLINE void __prof_dx11_zone_cleanup_func(TracyCD3D11ZoneCtx *ctx) { ___tracy_d3d11_emit_zone_end(*ctx); } # define __profnc_dx11(dx11_ctx, name, color) static const struct ___tracy_source_location_data CAT(__tracy_gpu_d3d11_source_location,__LINE__) = { name, __func__, __FILE__, (uint32_t)__LINE__, BGR32(color) }; __attribute((cleanup(__prof_dx11_zone_cleanup_func))) TracyCD3D11ZoneCtx __tracy_d3d11_zone_ctx; ___tracy_d3d11_emit_zone_begin( dx11_ctx, &__tracy_d3d11_zone_ctx, &CAT(__tracy_gpu_d3d11_source_location,__LINE__), 1) @@ -135,7 +136,7 @@ INLINE void __prof_dx12_zone_cleanup_func(TracyCD3D12ZoneCtx *ctx) { ___tracy_d3 # define __prof_dx12_ctx_release(ctx) # define __prof_dx12_new_frame(ctx) # define __prof_dx12_collect(ctx) -#endif /* PROFILING_D3D */ +#endif /* PROFILING_GPU */ #if PROFILING_CAPTURE_FRAME_IMAGE # define __profframeimage(image, width, height, offset, flipped) TracyCFrameImage((image), (width), (height), (offset), (flipped)) diff --git a/src/sim_step.c b/src/sim_step.c index 42068709..7293c46a 100644 --- a/src/sim_step.c +++ b/src/sim_step.c @@ -268,6 +268,8 @@ INTERNAL void test_spawn_entities2(struct sim_ent *parent, struct v2 pos) struct quad collider_quad = quad_from_rect(RECT(-0.5, -0.5, 1, 1)); e->local_collider = collider_from_quad(collider_quad); + sim_ent_enable_prop(e, SEPROP_LIGHT_TEST); + sim_ent_enable_prop(e, SEPROP_DYNAMIC); e->mass_unscaled = 100; e->inertia_unscaled = 50;