Skip to content

Commit

Permalink
Replace strings
Browse files Browse the repository at this point in the history
  • Loading branch information
RobDangerous committed Feb 24, 2025
1 parent 6659850 commit 3c90b21
Show file tree
Hide file tree
Showing 122 changed files with 1,981 additions and 1,982 deletions.
18 changes: 9 additions & 9 deletions backends/audio/directsound/sources/DirectSound.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ void kore_audio_init() {
audio_buffer.channels[0] = new float[audio_buffer.data_size];
audio_buffer.channels[1] = new float[audio_buffer.data_size];

kinc_microsoft_affirm(DirectSoundCreate8(nullptr, &dsound, nullptr));
kore_microsoft_affirm(DirectSoundCreate8(nullptr, &dsound, nullptr));
// TODO (DK) only for the main window?
kinc_microsoft_affirm(dsound->SetCooperativeLevel(kinc_windows_window_handle(0), DSSCL_PRIORITY));
kore_microsoft_affirm(dsound->SetCooperativeLevel(kore_windows_window_handle(0), DSSCL_PRIORITY));

WAVEFORMATEX waveFormat;
waveFormat.wFormatTag = WAVE_FORMAT_PCM;
Expand All @@ -63,18 +63,18 @@ void kore_audio_init() {
bufferDesc.lpwfxFormat = &waveFormat;
bufferDesc.guid3DAlgorithm = GUID_NULL;

kinc_microsoft_affirm(dsound->CreateSoundBuffer(&bufferDesc, &dbuffer, nullptr));
kore_microsoft_affirm(dsound->CreateSoundBuffer(&bufferDesc, &dbuffer, nullptr));

DWORD size1;
uint8_t *buffer1 = NULL;
kinc_microsoft_affirm(dbuffer->Lock(writePos, gap, (void **)&buffer1, &size1, nullptr, nullptr, 0));
kore_microsoft_affirm(dbuffer->Lock(writePos, gap, (void **)&buffer1, &size1, nullptr, nullptr, 0));
assert(buffer1 != NULL);
for (DWORD i = 0; i < size1; ++i) {
buffer1[i] = 0;
}
kinc_microsoft_affirm(dbuffer->Unlock(buffer1, size1, nullptr, 0));
kore_microsoft_affirm(dbuffer->Unlock(buffer1, size1, nullptr, 0));

kinc_microsoft_affirm(dbuffer->Play(0, 0, DSBPLAY_LOOPING));
kore_microsoft_affirm(dbuffer->Play(0, 0, DSBPLAY_LOOPING));
}

uint32_t kore_audio_samples_per_second(void) {
Expand All @@ -98,7 +98,7 @@ namespace {
void kore_audio_update() {
DWORD playPosition;
DWORD writePosition;
kinc_microsoft_affirm(dbuffer->GetCurrentPosition(&playPosition, &writePosition));
kore_microsoft_affirm(dbuffer->GetCurrentPosition(&playPosition, &writePosition));

int dif;
if (writePos >= writePosition) {
Expand Down Expand Up @@ -132,14 +132,14 @@ void kore_audio_update() {

DWORD size1;
uint8_t *buffer1;
kinc_microsoft_affirm(dbuffer->Lock(writePos, gap, (void **)&buffer1, &size1, NULL, NULL, 0));
kore_microsoft_affirm(dbuffer->Lock(writePos, gap, (void **)&buffer1, &size1, NULL, NULL, 0));

for (DWORD i = 0; i < size1 - (bitsPerSample / 8 - 1);) {
copySample(buffer1, i, ((writePos + i) / 2) % 2 == 0);
}
writePos += size1;

kinc_microsoft_affirm(dbuffer->Unlock(buffer1, size1, NULL, 0));
kore_microsoft_affirm(dbuffer->Unlock(buffer1, size1, NULL, 0));

if (writePos >= dsize) {
writePos -= dsize;
Expand Down
56 changes: 28 additions & 28 deletions backends/audio/wasapi_winrt/sources/WASAPI.winrt.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
#include <AudioClient.h>
#include <Windows.h>
#include <initguid.h>
#ifdef KINC_WINDOWSAPP
#ifdef KORE_WINDOWSAPP
#include <mfapi.h>
#endif
#include <mmdeviceapi.h>
#include <wrl/implements.h>

#ifdef KINC_WINDOWSAPP
#ifdef KORE_WINDOWSAPP
using namespace ::Microsoft::WRL;
using namespace Windows::Media::Devices;
using namespace Windows::Storage::Streams;
Expand All @@ -37,8 +37,8 @@ template <class T> void SafeRelease(__deref_inout_opt T **ppT) {

// based on the implementation in soloud and Microsoft sample code
namespace {
kinc_thread_t thread;
kinc_a2_buffer_t a2_buffer;
kore_thread_t thread;
kore_a2_buffer_t a2_buffer;

IMMDeviceEnumerator *deviceEnumerator;
IMMDevice *device;
Expand All @@ -54,7 +54,7 @@ namespace {
bool initDefaultDevice();
void audioThread(LPVOID);

#ifdef KINC_WINDOWSAPP
#ifdef KORE_WINDOWSAPP
class AudioRenderer : public RuntimeClass<RuntimeClassFlags<ClassicCom>, FtmBase, IActivateAudioInterfaceCompletionHandler> {
public:
STDMETHOD(ActivateCompleted)(IActivateAudioInterfaceAsyncOperation *operation) {
Expand All @@ -74,7 +74,7 @@ namespace {
#endif

bool initDefaultDevice() {
#ifdef KINC_WINDOWSAPP
#ifdef KORE_WINDOWSAPP
HRESULT hr = S_OK;
#else
if (renderClient != NULL) {
Expand All @@ -92,7 +92,7 @@ namespace {
bufferEndEvent = 0;
}

kinc_log(KINC_LOG_LEVEL_INFO, "Initializing a new default audio device.");
kore_log(KORE_LOG_LEVEL_INFO, "Initializing a new default audio device.");

HRESULT hr = deviceEnumerator->GetDefaultAudioEndpoint(eRender, eConsole, &device);
if (hr == S_OK) {
Expand All @@ -115,7 +115,7 @@ namespace {

HRESULT supported = audioClient->IsFormatSupported(AUDCLNT_SHAREMODE_SHARED, format, &closestFormat);
if (supported == S_FALSE) {
kinc_log(KINC_LOG_LEVEL_WARNING, "Falling back to the system's preferred WASAPI mix format.", supported);
kore_log(KORE_LOG_LEVEL_WARNING, "Falling back to the system's preferred WASAPI mix format.", supported);
if (closestFormat != nullptr) {
format = closestFormat;
}
Expand All @@ -125,30 +125,30 @@ namespace {
}
HRESULT result = audioClient->Initialize(AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_EVENTCALLBACK, 40 * 1000 * 10, 0, format, 0);
if (result != S_OK) {
kinc_log(KINC_LOG_LEVEL_WARNING, "Could not initialize WASAPI audio, going silent (error code 0x%x).", result);
kore_log(KORE_LOG_LEVEL_WARNING, "Could not initialize WASAPI audio, going silent (error code 0x%x).", result);
return false;
}

uint32_t old_samples_per_second = samples_per_second;
samples_per_second = format->nSamplesPerSec;
if (samples_per_second != old_samples_per_second) {
kinc_a2_internal_sample_rate_callback();
kore_a2_internal_sample_rate_callback();
}
a2_buffer.channel_count = 2;

bufferFrames = 0;
kinc_microsoft_affirm(audioClient->GetBufferSize(&bufferFrames));
kinc_microsoft_affirm(audioClient->GetService(__uuidof(IAudioRenderClient), reinterpret_cast<void **>(&renderClient)));
kore_microsoft_affirm(audioClient->GetBufferSize(&bufferFrames));
kore_microsoft_affirm(audioClient->GetService(__uuidof(IAudioRenderClient), reinterpret_cast<void **>(&renderClient)));

bufferEndEvent = CreateEvent(0, FALSE, FALSE, 0);
kinc_affirm(bufferEndEvent != 0);
kore_affirm(bufferEndEvent != 0);

kinc_microsoft_affirm(audioClient->SetEventHandle(bufferEndEvent));
kore_microsoft_affirm(audioClient->SetEventHandle(bufferEndEvent));

return true;
}
else {
kinc_log(KINC_LOG_LEVEL_WARNING, "Could not initialize WASAPI audio.");
kore_log(KORE_LOG_LEVEL_WARNING, "Could not initialize WASAPI audio.");
return false;
}
}
Expand Down Expand Up @@ -199,7 +199,7 @@ namespace {
return;
}

if (kinc_a2_internal_callback(&a2_buffer, frames)) {
if (kore_a2_internal_callback(&a2_buffer, frames)) {
if (format->wFormatTag == WAVE_FORMAT_PCM) {
for (UINT32 i = 0; i < frames; ++i) {
copyS16Sample((int16_t *)&buffer[i * format->nBlockAlign], (int16_t *)&buffer[i * format->nBlockAlign + 2]);
Expand Down Expand Up @@ -247,18 +247,18 @@ namespace {

} // namespace

#ifndef KINC_WINDOWSAPP
extern "C" void kinc_windows_co_initialize(void);
#ifndef KORE_WINDOWSAPP
extern "C" void kore_windows_co_initialize(void);
#endif

static bool initialized = false;

void kinc_a2_init() {
void kore_a2_init() {
if (initialized) {
return;
}

kinc_a2_internal_init();
kore_a2_internal_init();
initialized = true;

a2_buffer.read_location = 0;
Expand All @@ -268,31 +268,31 @@ void kinc_a2_init() {
a2_buffer.channels[0] = (float *)malloc(a2_buffer.data_size * sizeof(float));
a2_buffer.channels[1] = (float *)malloc(a2_buffer.data_size * sizeof(float));

#ifdef KINC_WINDOWSAPP
#ifdef KORE_WINDOWSAPP
renderer = Make<AudioRenderer>();

IActivateAudioInterfaceAsyncOperation *asyncOp;
Platform::String ^ deviceId = MediaDevice::GetDefaultAudioRenderId(Windows::Media::Devices::AudioDeviceRole::Default);
kinc_microsoft_affirm(ActivateAudioInterfaceAsync(deviceId->Data(), __uuidof(IAudioClient2), nullptr, renderer.Get(), &asyncOp));
kore_microsoft_affirm(ActivateAudioInterfaceAsync(deviceId->Data(), __uuidof(IAudioClient2), nullptr, renderer.Get(), &asyncOp));
SafeRelease(&asyncOp);
#else
kinc_windows_co_initialize();
kinc_microsoft_affirm(
kore_windows_co_initialize();
kore_microsoft_affirm(
CoCreateInstance(__uuidof(MMDeviceEnumerator), 0, CLSCTX_ALL, __uuidof(IMMDeviceEnumerator), reinterpret_cast<void **>(&deviceEnumerator)));

if (initDefaultDevice()) {
kinc_thread_init(&thread, audioThread, NULL);
kore_thread_init(&thread, audioThread, NULL);
}
#endif
}

uint32_t kinc_a2_samples_per_second(void) {
uint32_t kore_a2_samples_per_second(void) {
return samples_per_second;
}

void kinc_a2_update() {}
void kore_a2_update() {}

void kinc_a2_shutdown() {
void kore_a2_shutdown() {
// Wait for last data in buffer to play before stopping.
// Sleep((DWORD)(hnsActualDuration/REFTIMES_PER_MILLISEC/2));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ void kore_d3d11_command_list_prepare_raytracing_volume(kore_gpu_command_list *li

void kore_d3d11_command_list_prepare_raytracing_hierarchy(kore_gpu_command_list *list, kore_gpu_raytracing_hierarchy *hierarchy);

void kore_d3d11_command_list_update_raytracing_hierarchy(kore_gpu_command_list *list, kinc_matrix4x4_t *volume_transforms, uint32_t volumes_count,
void kore_d3d11_command_list_update_raytracing_hierarchy(kore_gpu_command_list *list, kore_matrix4x4_t *volume_transforms, uint32_t volumes_count,
kore_gpu_raytracing_hierarchy *hierarchy);

void kore_d3d11_command_list_set_ray_pipeline(kore_gpu_command_list *list, kore_d3d11_ray_pipeline *pipeline);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ void kore_d3d11_device_wait_until_idle(kore_gpu_device *device);
void kore_d3d11_device_create_raytracing_volume(kore_gpu_device *device, kore_gpu_buffer *vertex_buffer, uint64_t vertex_count, kore_gpu_buffer *index_buffer,
uint32_t index_count, kore_gpu_raytracing_volume *volume);

void kore_d3d11_device_create_raytracing_hierarchy(kore_gpu_device *device, kore_gpu_raytracing_volume **volumes, kinc_matrix4x4_t *volume_transforms,
void kore_d3d11_device_create_raytracing_hierarchy(kore_gpu_device *device, kore_gpu_raytracing_volume **volumes, kore_matrix4x4_t *volume_transforms,
uint32_t volumes_count, kore_gpu_raytracing_hierarchy *hierarchy);

void kore_d3d11_device_create_query_set(kore_gpu_device *device, const kore_gpu_query_set_parameters *parameters, kore_gpu_query_set *query_set);
Expand Down
2 changes: 1 addition & 1 deletion backends/gpu/direct3d11/sources/commandlist.c
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ void kore_d3d11_command_list_prepare_raytracing_volume(kore_gpu_command_list *li

void kore_d3d11_command_list_prepare_raytracing_hierarchy(kore_gpu_command_list *list, kore_gpu_raytracing_hierarchy *hierarchy) {}

void kore_d3d11_command_list_update_raytracing_hierarchy(kore_gpu_command_list *list, kinc_matrix4x4_t *volume_transforms, uint32_t volumes_count,
void kore_d3d11_command_list_update_raytracing_hierarchy(kore_gpu_command_list *list, kore_matrix4x4_t *volume_transforms, uint32_t volumes_count,
kore_gpu_raytracing_hierarchy *hierarchy) {}

void kore_d3d11_command_list_set_ray_pipeline(kore_gpu_command_list *list, kore_d3d11_ray_pipeline *pipeline) {}
Expand Down
2 changes: 1 addition & 1 deletion backends/gpu/direct3d11/sources/device.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ void kore_d3d11_device_create_sampler(kore_gpu_device *device, const kore_gpu_sa
void kore_d3d11_device_create_raytracing_volume(kore_gpu_device *device, kore_gpu_buffer *vertex_buffer, uint64_t vertex_count, kore_gpu_buffer *index_buffer,
uint32_t index_count, kore_gpu_raytracing_volume *volume) {}

void kore_d3d11_device_create_raytracing_hierarchy(kore_gpu_device *device, kore_gpu_raytracing_volume **volumes, kinc_matrix4x4_t *volume_transforms,
void kore_d3d11_device_create_raytracing_hierarchy(kore_gpu_device *device, kore_gpu_raytracing_volume **volumes, kore_matrix4x4_t *volume_transforms,
uint32_t volumes_count, kore_gpu_raytracing_hierarchy *hierarchy) {}

void kore_d3d11_device_create_query_set(kore_gpu_device *device, const kore_gpu_query_set_parameters *parameters, kore_gpu_query_set *query_set) {}
Expand Down
2 changes: 1 addition & 1 deletion backends/gpu/direct3d12/sources/device.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ void kore_d3d12_device_create_buffer(kore_gpu_device *device, const kore_gpu_buf
// buffer->impl.format = format;

// static_assert(sizeof(D3D12IindexBufferView) == sizeof(D3D12_INDEX_BUFFER_VIEW), "Something is wrong with D3D12IindexBufferView");
// int uploadBufferSize = format == KINC_G5_INDEX_BUFFER_FORMAT_16BIT ? sizeof(uint16_t) * count : sizeof(uint32_t) * count;
// int uploadBufferSize = format == KORE_G5_INDEX_BUFFER_FORMAT_16BIT ? sizeof(uint16_t) * count : sizeof(uint32_t) * count;

D3D12_HEAP_PROPERTIES props;
props.CPUPageProperty = D3D12_CPU_PAGE_PROPERTY_UNKNOWN;
Expand Down
2 changes: 1 addition & 1 deletion backends/gpu/metal/sources/device.m
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ void kore_metal_device_set_name(kore_gpu_device *device, const char *name) {}
void kore_metal_device_create_buffer(kore_gpu_device *device, const kore_gpu_buffer_parameters *parameters, kore_gpu_buffer *buffer) {
id<MTLDevice> metal_device = (__bridge id<MTLDevice>)device->metal.device;
MTLResourceOptions options = MTLResourceCPUCacheModeWriteCombined;
#ifdef KINC_APPLE_SOC
#ifdef KORE_APPLE_SOC
options |= MTLResourceStorageModeShared;
#else
if ((parameters->usage_flags & KORE_GPU_BUFFER_USAGE_CPU_WRITE) != 0) {
Expand Down
4 changes: 2 additions & 2 deletions backends/gpu/metal/sources/pipeline.m
Original file line number Diff line number Diff line change
Expand Up @@ -128,15 +128,15 @@ static MTLPixelFormat convert_format(kore_gpu_texture_format format) {
case KORE_GPU_TEXTURE_FORMAT_RGBA32_FLOAT:
return MTLPixelFormatRGBA32Float;
case KORE_GPU_TEXTURE_FORMAT_DEPTH16_UNORM:
#ifdef KINC_IOS
#ifdef KORE_IOS
assert(false);
return MTLPixelFormatRGBA8Unorm;
#else
return MTLPixelFormatDepth32Float; // only in new iOS
#endif
case KORE_GPU_TEXTURE_FORMAT_DEPTH24PLUS_NOTHING8:
case KORE_GPU_TEXTURE_FORMAT_DEPTH24PLUS_STENCIL8:
#ifdef KINC_IOS
#ifdef KORE_IOS
assert(false);
return MTLPixelFormatDepth32Float_Stencil8;
#else
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ void kore_opengl_command_list_prepare_raytracing_volume(kore_gpu_command_list *l

void kore_opengl_command_list_prepare_raytracing_hierarchy(kore_gpu_command_list *list, kore_gpu_raytracing_hierarchy *hierarchy);

void kore_opengl_command_list_update_raytracing_hierarchy(kore_gpu_command_list *list, kinc_matrix4x4_t *volume_transforms, uint32_t volumes_count,
void kore_opengl_command_list_update_raytracing_hierarchy(kore_gpu_command_list *list, kore_matrix4x4_t *volume_transforms, uint32_t volumes_count,
kore_gpu_raytracing_hierarchy *hierarchy);

void kore_opengl_command_list_set_ray_pipeline(kore_gpu_command_list *list, kore_opengl_ray_pipeline *pipeline);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ void kore_opengl_device_wait_until_idle(kore_gpu_device *device);
void kore_opengl_device_create_raytracing_volume(kore_gpu_device *device, kore_gpu_buffer *vertex_buffer, uint64_t vertex_count, kore_gpu_buffer *index_buffer,
uint32_t index_count, kore_gpu_raytracing_volume *volume);

void kore_opengl_device_create_raytracing_hierarchy(kore_gpu_device *device, kore_gpu_raytracing_volume **volumes, kinc_matrix4x4_t *volume_transforms,
void kore_opengl_device_create_raytracing_hierarchy(kore_gpu_device *device, kore_gpu_raytracing_volume **volumes, kore_matrix4x4_t *volume_transforms,
uint32_t volumes_count, kore_gpu_raytracing_hierarchy *hierarchy);

void kore_opengl_device_create_query_set(kore_gpu_device *device, const kore_gpu_query_set_parameters *parameters, kore_gpu_query_set *query_set);
Expand Down
2 changes: 1 addition & 1 deletion backends/gpu/opengl/sources/commandlist.c
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ void kore_opengl_command_list_prepare_raytracing_volume(kore_gpu_command_list *l

void kore_opengl_command_list_prepare_raytracing_hierarchy(kore_gpu_command_list *list, kore_gpu_raytracing_hierarchy *hierarchy) {}

void kore_opengl_command_list_update_raytracing_hierarchy(kore_gpu_command_list *list, kinc_matrix4x4_t *volume_transforms, uint32_t volumes_count,
void kore_opengl_command_list_update_raytracing_hierarchy(kore_gpu_command_list *list, kore_matrix4x4_t *volume_transforms, uint32_t volumes_count,
kore_gpu_raytracing_hierarchy *hierarchy) {}

void kore_opengl_command_list_set_ray_pipeline(kore_gpu_command_list *list, kore_opengl_ray_pipeline *pipeline) {}
Expand Down
2 changes: 1 addition & 1 deletion backends/gpu/opengl/sources/device.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ void kore_opengl_device_create_sampler(kore_gpu_device *device, const kore_gpu_s
void kore_opengl_device_create_raytracing_volume(kore_gpu_device *device, kore_gpu_buffer *vertex_buffer, uint64_t vertex_count, kore_gpu_buffer *index_buffer,
uint32_t index_count, kore_gpu_raytracing_volume *volume) {}

void kore_opengl_device_create_raytracing_hierarchy(kore_gpu_device *device, kore_gpu_raytracing_volume **volumes, kinc_matrix4x4_t *volume_transforms,
void kore_opengl_device_create_raytracing_hierarchy(kore_gpu_device *device, kore_gpu_raytracing_volume **volumes, kore_matrix4x4_t *volume_transforms,
uint32_t volumes_count, kore_gpu_raytracing_hierarchy *hierarchy) {}

void kore_opengl_device_create_query_set(kore_gpu_device *device, const kore_gpu_query_set_parameters *parameters, kore_gpu_query_set *query_set) {}
Expand Down
4 changes: 2 additions & 2 deletions backends/gpu/vulkan/sources/commandlist.c
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ void kore_vulkan_command_list_begin_render_pass(kore_gpu_command_list *list, con
.pStencilAttachment = VK_NULL_HANDLE,
};

#ifndef KINC_ANDROID // TODO
#ifndef KORE_ANDROID // TODO
vkCmdBeginRendering(list->vulkan.command_buffer, &rendering_info);
#endif

Expand All @@ -94,7 +94,7 @@ void kore_vulkan_command_list_begin_render_pass(kore_gpu_command_list *list, con
}

void kore_vulkan_command_list_end_render_pass(kore_gpu_command_list *list) {
#ifndef KINC_ANDROID // TODO
#ifndef KORE_ANDROID // TODO
vkCmdEndRendering(list->vulkan.command_buffer);
#endif
}
Expand Down
Loading

0 comments on commit 3c90b21

Please sign in to comment.