jacob/power_play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

formatting

Browse Source
This commit is contained in:
jacob 2026-03-28 12:25:42 -05:00
parent a856376a90
commit 97711b0970
3 changed files with 47 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/base/base_arena.h
View File

@ -67,10 +67,9 @@ TempArena BeginScratch(Arena *potential_conflict);
TempArena BeginScratchNoConflict_(void); TempArena BeginScratchNoConflict_(void);
void EndScratch(TempArena scratch_temp); void EndScratch(TempArena scratch_temp);
// This macro declares an unused "arena" variable that will produce a shadowing // This macro declares an unused "arena" variable in order to produce a shadowing
// warning variable is present (due to shadowing). This is for catching obvious // warning. This is for catching obvious cases of `BeginScratchNoConflict`
// cases of `BeginScratchNoConflict` getting called when an `arena` variable // getting called when an `arena` variable already exists in the caller's scope.
// already exists in the caller's scope.
#define BeginScratchNoConflict() \ #define BeginScratchNoConflict() \
BeginScratchNoConflict_(); \ BeginScratchNoConflict_(); \
do { \ do { \

102
src/gpu/gpu_common.c
View File

@ -55,72 +55,52 @@ void G_BootstrapCommon(void)
} }
// Init basic samplers // Init basic samplers
for (G_BasicSamplerKind sampler_kind = 0; sampler_kind < countof(G.basic_samplers); ++sampler_kind)
{ {
G_SamplerRef sampler = Zi;
switch (sampler_kind)
{
default:
{
// Sampler unspecified
Assert(0);
} FALLTHROUGH;
case G_BasicSamplerKind_PointClamp:
{ {
G_Filter filter = G_Filter_MinMagMipPoint; G_Filter filter = G_Filter_MinMagMipPoint;
G_AddressMode address_mode = G_AddressMode_Clamp; G_AddressMode address_mode = G_AddressMode_Clamp;
sampler = G_PushSampler(cl, gpu_perm, .filter = filter, .x = address_mode, .y = address_mode, .z = address_mode); G.basic_samplers[G_BasicSamplerKind_PointClamp] = G_PushSampler(cl, gpu_perm, .filter = filter, .x = address_mode, .y = address_mode, .z = address_mode);
} break; }
case G_BasicSamplerKind_PointWrap: {
{ G_Filter filter = G_Filter_MinMagMipPoint;
G_Filter filter = G_Filter_MinMagMipPoint; G_AddressMode address_mode = G_AddressMode_Wrap;
G_AddressMode address_mode = G_AddressMode_Wrap; G.basic_samplers[G_BasicSamplerKind_PointWrap] = G_PushSampler(cl, gpu_perm, .filter = filter, .x = address_mode, .y = address_mode, .z = address_mode);
sampler = G_PushSampler(cl, gpu_perm, .filter = filter, .x = address_mode, .y = address_mode, .z = address_mode); }
} break; {
case G_BasicSamplerKind_PointMirror: G_Filter filter = G_Filter_MinMagMipPoint;
{ G_AddressMode address_mode = G_AddressMode_Mirror;
G_Filter filter = G_Filter_MinMagMipPoint; G.basic_samplers[G_BasicSamplerKind_PointMirror] = G_PushSampler(cl, gpu_perm, .filter = filter, .x = address_mode, .y = address_mode, .z = address_mode);
G_AddressMode address_mode = G_AddressMode_Mirror; }
sampler = G_PushSampler(cl, gpu_perm, .filter = filter, .x = address_mode, .y = address_mode, .z = address_mode); {
} break; G_Filter filter = G_Filter_MinMagLinearMipPoint;
case G_BasicSamplerKind_BilinearClamp: G_AddressMode address_mode = G_AddressMode_Clamp;
{ G.basic_samplers[G_BasicSamplerKind_BilinearClamp] = G_PushSampler(cl, gpu_perm, .filter = filter, .x = address_mode, .y = address_mode, .z = address_mode);
G_Filter filter = G_Filter_MinMagLinearMipPoint; }
G_AddressMode address_mode = G_AddressMode_Clamp; {
sampler = G_PushSampler(cl, gpu_perm, .filter = filter, .x = address_mode, .y = address_mode, .z = address_mode); G_Filter filter = G_Filter_MinMagLinearMipPoint;
} break; G_AddressMode address_mode = G_AddressMode_Wrap;
case G_BasicSamplerKind_BilinearWrap: G.basic_samplers[G_BasicSamplerKind_BilinearWrap] = G_PushSampler(cl, gpu_perm, .filter = filter, .x = address_mode, .y = address_mode, .z = address_mode);
{ }
G_Filter filter = G_Filter_MinMagLinearMipPoint; {
G_AddressMode address_mode = G_AddressMode_Wrap; G_Filter filter = G_Filter_MinMagLinearMipPoint;
sampler = G_PushSampler(cl, gpu_perm, .filter = filter, .x = address_mode, .y = address_mode, .z = address_mode); G_AddressMode address_mode = G_AddressMode_Mirror;
} break; G.basic_samplers[G_BasicSamplerKind_BilinearMirror] = G_PushSampler(cl, gpu_perm, .filter = filter, .x = address_mode, .y = address_mode, .z = address_mode);
case G_BasicSamplerKind_BilinearMirror: }
{ {
G_Filter filter = G_Filter_MinMagLinearMipPoint; G_Filter filter = G_Filter_MinMagMipLinear;
G_AddressMode address_mode = G_AddressMode_Mirror; G_AddressMode address_mode = G_AddressMode_Clamp;
sampler = G_PushSampler(cl, gpu_perm, .filter = filter, .x = address_mode, .y = address_mode, .z = address_mode); G.basic_samplers[G_BasicSamplerKind_TrilinearClamp] = G_PushSampler(cl, gpu_perm, .filter = filter, .x = address_mode, .y = address_mode, .z = address_mode);
} break; }
case G_BasicSamplerKind_TrilinearClamp: {
{ G_Filter filter = G_Filter_MinMagMipLinear;
G_Filter filter = G_Filter_MinMagMipLinear; G_AddressMode address_mode = G_AddressMode_Wrap;
G_AddressMode address_mode = G_AddressMode_Clamp; G.basic_samplers[G_BasicSamplerKind_TrilinearWrap] = G_PushSampler(cl, gpu_perm, .filter = filter, .x = address_mode, .y = address_mode, .z = address_mode);
sampler = G_PushSampler(cl, gpu_perm, .filter = filter, .x = address_mode, .y = address_mode, .z = address_mode); }
} break; {
case G_BasicSamplerKind_TrilinearWrap: G_Filter filter = G_Filter_MinMagMipLinear;
{ G_AddressMode address_mode = G_AddressMode_Mirror;
G_Filter filter = G_Filter_MinMagMipLinear; G.basic_samplers[G_BasicSamplerKind_TrilinearMirror] = G_PushSampler(cl, gpu_perm, .filter = filter, .x = address_mode, .y = address_mode, .z = address_mode);
G_AddressMode address_mode = G_AddressMode_Wrap;
sampler = G_PushSampler(cl, gpu_perm, .filter = filter, .x = address_mode, .y = address_mode, .z = address_mode);
} break;
case G_BasicSamplerKind_TrilinearMirror:
{
G_Filter filter = G_Filter_MinMagMipLinear;
G_AddressMode address_mode = G_AddressMode_Mirror;
sampler = G_PushSampler(cl, gpu_perm, .filter = filter, .x = address_mode, .y = address_mode, .z = address_mode);
} break;
} }
G.basic_samplers[sampler_kind] = sampler;
} }
} }
G_CommitCommandList(cl); G_CommitCommandList(cl);

2
src/pp/pp_vis/pp_vis_core.c
View File

@ -1789,7 +1789,7 @@ void V_TickForever(WaveLaneCtx *lane)
frame->local_world->seed = predict_world->seed; frame->local_world->seed = predict_world->seed;
P_ClearFrames(frame->local_world, I64Min, I64Max); P_ClearFrames(frame->local_world, I64Min, I64Max);
if (TweakBool("Interpolation enabled", 0)) if (TweakBool("Interpolation enabled", 1))
{ {
// Locate sim keyframes // Locate sim keyframes
P_Frame *left_sim_frame = &P_NilFrame; P_Frame *left_sim_frame = &P_NilFrame;