Skip to content

Commit 7b659c3

Browse files
maluoimaluoi
committed
-Renamed all skr_ to skg_
1 parent 3899106 commit 7b659c3

18 files changed

+2460
-2266
lines changed

‎examples/common/app.cpp

+140-140
Large diffs are not rendered by default.

‎examples/common/xr_app.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -718,15 +718,15 @@ void openxr_projection(XrFovf fov, float nearZ, float farZ, float *out_matrix)
718718
// Set to tanAngleDown - tanAngleUp for a clip space with positive Y
719719
// down (Vulkan). Set to tanAngleUp - tanAngleDown for a clip space with
720720
// positive Y up (OpenGL / D3D / Metal).
721-
#if defined(SKR_VULKAN)
721+
#if defined(SKG_VULKAN)
722722
const float tanAngleHeight = (tanDown - tanUp);
723723
#else
724724
const float tanAngleHeight = (tanUp - tanDown);
725725
#endif
726726

727727
// Set to nearZ for a [-1,1] Z clip space (OpenGL / OpenGL ES).
728728
// Set to zero for a [0,1] Z clip space (Vulkan / D3D / Metal).
729-
#if defined(SKR_OPENGL) || defined(SKR_OPENGLES)
729+
#if defined(SKG_OPENGL) || defined(SKG_OPENGLES)
730730
const float offsetZ = nearZ;
731731
#else
732732
const float offsetZ = 0;

‎examples/sk_gpu_andr/sk_gpu_andr.NativeActivity/main.cpp

+39-39
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ struct saved_state {
2020
};
2121

2222
struct swapchain_surfdata_t {
23-
skr_tex_t depth_tex;
24-
skr_tex_t render_tex;
23+
skg_tex_t depth_tex;
24+
skg_tex_t render_tex;
2525
};
2626

2727
struct app_swapchain_t {
@@ -39,7 +39,7 @@ struct engine {
3939
#ifdef XR
4040
app_swapchain_t swapchain;
4141
#else
42-
skr_swapchain_t swapchain;
42+
skg_swapchain_t swapchain;
4343
#endif
4444
int animating;
4545
struct saved_state state;
@@ -77,12 +77,12 @@ bool android_fopen(const char *filename, void **out_data, size_t *out_size) {
7777

7878
///////////////////////////////////////////
7979

80-
void android_log_callback(skr_log_ level, const char *text) {
80+
void android_log_callback(skg_log_ level, const char *text) {
8181
int priority = ANDROID_LOG_INFO;
8282
switch (level) {
83-
case skr_log_info: priority = ANDROID_LOG_INFO; break;
84-
case skr_log_warning: priority = ANDROID_LOG_WARN; break;
85-
case skr_log_critical: priority = ANDROID_LOG_ERROR; break;
83+
case skg_log_info: priority = ANDROID_LOG_INFO; break;
84+
case skg_log_warning: priority = ANDROID_LOG_WARN; break;
85+
case skg_log_critical: priority = ANDROID_LOG_ERROR; break;
8686
}
8787
__android_log_write(priority, "sk_gpu", text);
8888
}
@@ -93,13 +93,13 @@ void android_log_callback(skr_log_ level, const char *text) {
9393
static int engine_init_display(struct engine* engine) {
9494
if (engine->initialized)
9595
return 0;
96-
skr_callback_file_read(android_fopen);
97-
skr_callback_log (android_log_callback);
98-
int result = skr_init("skr_gpu.h", engine->app->window, nullptr);
96+
skg_callback_file_read(android_fopen);
97+
skg_callback_log (android_log_callback);
98+
int result = skg_init("skg_gpu.h", engine->app->window, nullptr);
9999
if (!result) return result;
100100

101101
engine->initialized = true;
102-
engine->swapchain = skr_swapchain_create(skr_tex_fmt_rgba32_linear, skr_tex_fmt_depth32, 1280, 720);
102+
engine->swapchain = skg_swapchain_create(skg_tex_fmt_rgba32_linear, skg_tex_fmt_depth32, 1280, 720);
103103

104104
return app_init() ? 1 : 0;
105105
}
@@ -108,10 +108,10 @@ static void engine_draw_frame(struct engine* engine) {
108108
if (!engine->initialized)
109109
return;
110110

111-
skr_draw_begin();
111+
skg_draw_begin();
112112
float clear_color[4] = { 0,1,0,1 };
113-
skr_tex_t *target = skr_swapchain_get_next(&engine->swapchain);
114-
skr_tex_target_bind(target, true, clear_color);
113+
skg_tex_t *target = skg_swapchain_get_next(&engine->swapchain);
114+
skg_tex_target_bind(target, true, clear_color);
115115

116116
static int32_t frame = 0;
117117
frame++;
@@ -124,7 +124,7 @@ static void engine_draw_frame(struct engine* engine) {
124124

125125
app_render(frame * 0.016f, view, proj);
126126

127-
skr_swapchain_present(&engine->swapchain);
127+
skg_swapchain_present(&engine->swapchain);
128128
}
129129

130130
#else
@@ -133,20 +133,20 @@ bool main_init_gfx(void *user_data, const XrGraphicsRequirements *requirements,
133133
engine *eng = (engine*)user_data;
134134

135135
LOGI("Beginning initialization");
136-
skr_callback_file_read(android_fopen);
137-
skr_callback_log (android_log_callback);
138-
if (!skr_init("sk_gpu.h", eng->app->window, nullptr))
136+
skg_callback_file_read(android_fopen);
137+
skg_callback_log (android_log_callback);
138+
if (!skg_init("sk_gpu.h", eng->app->window, nullptr))
139139
return false;
140140

141-
skr_platform_data_t platform = skr_get_platform_data();
142-
#if defined(SKR_OPENGL) && defined(_WIN32)
141+
skg_platform_data_t platform = skg_get_platform_data();
142+
#if defined(SKG_OPENGL) && defined(_WIN32)
143143
out_graphics->hDC = (HDC )platform._gl_hdc;
144144
out_graphics->hGLRC = (HGLRC)platform._gl_hrc;
145-
#elif defined(SKR_OPENGL) && defined(__ANDROID__)
145+
#elif defined(SKG_OPENGL) && defined(__ANDROID__)
146146
out_graphics->display = (EGLDisplay)platform._egl_display;
147147
out_graphics->config = (EGLConfig )platform._egl_config;
148148
out_graphics->context = (EGLContext)platform._egl_context;
149-
#elif defined(SKR_DIRECT3D11)
149+
#elif defined(SKG_DIRECT3D11)
150150
out_graphics->device = (ID3D11Device*)platform._d3d11_device;
151151
#endif
152152

@@ -160,13 +160,13 @@ bool main_init_swapchain(void *user_data, int32_t view_count, int32_t surface_co
160160
eng->swapchain.view_count = view_count;
161161
eng->swapchain.surf_count = surface_count;
162162
eng->swapchain.surfaces = (swapchain_surfdata_t*)malloc(sizeof(swapchain_surfdata_t) * view_count * surface_count);
163-
skr_tex_fmt_ skr_format = skr_tex_fmt_from_native(fmt);
163+
skg_tex_fmt_ skg_format = skg_tex_fmt_from_native(fmt);
164164

165165
for (int32_t i = 0; i < view_count*surface_count; i++) {
166-
eng->swapchain.surfaces[i].render_tex = skr_tex_create_from_existing(textures[i], skr_tex_type_rendertarget, skr_format, width, height, surface_count);
167-
eng->swapchain.surfaces[i].depth_tex = skr_tex_create(skr_tex_type_depth, skr_use_static, skr_tex_fmt_depth32, skr_mip_none);
168-
skr_tex_set_contents(&eng->swapchain.surfaces[i].depth_tex, nullptr, 1, width, height);
169-
skr_tex_attach_depth(&eng->swapchain.surfaces[i].render_tex, &eng->swapchain.surfaces[i].depth_tex);
166+
eng->swapchain.surfaces[i].render_tex = skg_tex_create_from_existing(textures[i], skg_tex_type_rendertarget, skg_format, width, height, surface_count);
167+
eng->swapchain.surfaces[i].depth_tex = skg_tex_create(skg_tex_type_depth, skg_use_static, skg_tex_fmt_depth32, skg_mip_none);
168+
skg_tex_set_contents(&eng->swapchain.surfaces[i].depth_tex, nullptr, 1, width, height);
169+
skg_tex_attach_depth(&eng->swapchain.surfaces[i].render_tex, &eng->swapchain.surfaces[i].depth_tex);
170170
}
171171
return true;
172172
}
@@ -176,8 +176,8 @@ bool main_init_swapchain(void *user_data, int32_t view_count, int32_t surface_co
176176
void main_destroy_swapchain(void *user_data) {
177177
engine *eng = (engine*)user_data;
178178
for (int32_t i = 0; i < eng->swapchain.surf_count * eng->swapchain.view_count; i++) {
179-
skr_tex_destroy(&eng->swapchain.surfaces[i].render_tex);
180-
skr_tex_destroy(&eng->swapchain.surfaces[i].depth_tex);
179+
skg_tex_destroy(&eng->swapchain.surfaces[i].render_tex);
180+
skg_tex_destroy(&eng->swapchain.surfaces[i].depth_tex);
181181
}
182182
free(eng->swapchain.surfaces);
183183
eng->swapchain = {};
@@ -188,8 +188,8 @@ void main_destroy_swapchain(void *user_data) {
188188
void main_render(void *user_data, const XrCompositionLayerProjectionView *view, int32_t view_id, int32_t surf_id) {
189189
engine *eng = (engine*)user_data;
190190
float clear_color[4] = { 0,0,0,1 };
191-
skr_tex_t *target = &eng->swapchain.surfaces[view_id * eng->swapchain.surf_count + surf_id].render_tex;
192-
skr_tex_target_bind(target, true, clear_color);
191+
skg_tex_t *target = &eng->swapchain.surfaces[view_id * eng->swapchain.surf_count + surf_id].render_tex;
192+
skg_tex_target_bind(target, true, clear_color);
193193

194194
hmm_quaternion head_orientation;
195195
memcpy(&head_orientation, &view->pose.orientation, sizeof(XrQuaternionf));
@@ -223,13 +223,13 @@ static int engine_init_display(struct engine* engine) {
223223
engine->xr_functions.pixel_format_count = 4;
224224
engine->xr_functions.depth_formats = (int64_t*)malloc(sizeof(int64_t) * 3);
225225
engine->xr_functions.depth_format_count = 3;
226-
engine->xr_functions.pixel_formats[0] = skr_tex_fmt_to_native(skr_tex_fmt_rgba32_linear);
227-
engine->xr_functions.pixel_formats[1] = skr_tex_fmt_to_native(skr_tex_fmt_bgra32_linear);
228-
engine->xr_functions.pixel_formats[2] = skr_tex_fmt_to_native(skr_tex_fmt_rgba32);
229-
engine->xr_functions.pixel_formats[3] = skr_tex_fmt_to_native(skr_tex_fmt_bgra32);
230-
engine->xr_functions.depth_formats[0] = skr_tex_fmt_to_native(skr_tex_fmt_depth16);
231-
engine->xr_functions.depth_formats[1] = skr_tex_fmt_to_native(skr_tex_fmt_depth32);
232-
engine->xr_functions.depth_formats[2] = skr_tex_fmt_to_native(skr_tex_fmt_depthstencil);
226+
engine->xr_functions.pixel_formats[0] = skg_tex_fmt_to_native(skg_tex_fmt_rgba32_linear);
227+
engine->xr_functions.pixel_formats[1] = skg_tex_fmt_to_native(skg_tex_fmt_bgra32_linear);
228+
engine->xr_functions.pixel_formats[2] = skg_tex_fmt_to_native(skg_tex_fmt_rgba32);
229+
engine->xr_functions.pixel_formats[3] = skg_tex_fmt_to_native(skg_tex_fmt_bgra32);
230+
engine->xr_functions.depth_formats[0] = skg_tex_fmt_to_native(skg_tex_fmt_depth16);
231+
engine->xr_functions.depth_formats[1] = skg_tex_fmt_to_native(skg_tex_fmt_depth32);
232+
engine->xr_functions.depth_formats[2] = skg_tex_fmt_to_native(skg_tex_fmt_depthstencil);
233233

234234
LOGI("Initializing OpenXR");
235235
openxr_log_callback([](const char *text) { __android_log_write(ANDROID_LOG_INFO, "sk_gpu", text); });
@@ -263,7 +263,7 @@ static void engine_term_display(struct engine* engine) {
263263
#if XR
264264
openxr_shutdown();
265265
#endif
266-
skr_shutdown();
266+
skg_shutdown();
267267
LOGI("Done! Bye :)");
268268
engine->initialized = false;
269269
}

‎examples/sk_gpu_flat/main.cpp

+13-13
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ HWND app_hwnd;
1313
#endif
1414

1515
// When using single file header like normal, do this
16-
//#define SKR_OPENGL
17-
//#define SKR_IMPL
16+
//#define SKG_OPENGL
17+
//#define SKG_IMPL
1818
//#include "../sk_gpu.h"
1919

2020
// For easier development
@@ -33,7 +33,7 @@ HWND app_hwnd;
3333

3434
///////////////////////////////////////////
3535

36-
skr_swapchain_t app_swapchain = {};
36+
skg_swapchain_t app_swapchain = {};
3737
int app_width = 1280;
3838
int app_height = 720;
3939
bool app_run = true;
@@ -66,9 +66,9 @@ int main() {
6666
///////////////////////////////////////////
6767

6868
bool main_init() {
69-
skr_callback_log([](skr_log_ level, const char *text) { printf("[%d] %s\n", level, text); });
69+
skg_callback_log([](skg_log_ level, const char *text) { printf("[%d] %s\n", level, text); });
7070
#ifdef __EMSCRIPTEN__
71-
if (!skr_init(app_name, nullptr, nullptr)) return false;
71+
if (!skg_init(app_name, nullptr, nullptr)) return false;
7272
#else
7373
WNDCLASS wc = {};
7474
wc.lpfnWndProc = [](HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) {
@@ -77,7 +77,7 @@ bool main_init() {
7777
case WM_SIZE: {
7878
app_width = (UINT)LOWORD(lParam);
7979
app_height = (UINT)HIWORD(lParam);
80-
skr_swapchain_resize(&app_swapchain, app_width, app_height);
80+
skg_swapchain_resize(&app_swapchain, app_width, app_height);
8181
} return DefWindowProc(hWnd, message, wParam, lParam);
8282
default: return DefWindowProc(hWnd, message, wParam, lParam);
8383
}
@@ -94,9 +94,9 @@ bool main_init() {
9494
nullptr, nullptr, wc.hInstance, nullptr);
9595

9696
if( !app_hwnd ) return false;
97-
if (!skr_init(app_name, app_hwnd, nullptr)) return false;
97+
if (!skg_init(app_name, app_hwnd, nullptr)) return false;
9898
#endif
99-
app_swapchain = skr_swapchain_create(skr_tex_fmt_rgba32_linear, skr_tex_fmt_depth32, app_width, app_height);
99+
app_swapchain = skg_swapchain_create(skg_tex_fmt_rgba32_linear, skg_tex_fmt_depth32, app_width, app_height);
100100

101101
return app_init();
102102
}
@@ -105,7 +105,7 @@ bool main_init() {
105105

106106
void main_shutdown() {
107107
app_shutdown();
108-
skr_shutdown();
108+
skg_shutdown();
109109
}
110110

111111
///////////////////////////////////////////
@@ -119,10 +119,10 @@ int main_step(double t, void *) {
119119
}
120120
#endif
121121

122-
skr_draw_begin();
122+
skg_draw_begin();
123123
float clear_color[4] = { 0,0,0,1 };
124-
skr_tex_t *target = skr_swapchain_get_next(&app_swapchain);
125-
skr_tex_target_bind(target, true, clear_color);
124+
skg_tex_t *target = skg_swapchain_get_next(&app_swapchain);
125+
skg_tex_target_bind(target, true, clear_color);
126126

127127
hmm_mat4 view = HMM_LookAt(
128128
HMM_Vec3(sinf(t*0.001) * 5, 3, cosf(t*0.001) * 5),
@@ -132,7 +132,7 @@ int main_step(double t, void *) {
132132

133133
app_render(t, view, proj);
134134

135-
skr_swapchain_present(&app_swapchain);
135+
skg_swapchain_present(&app_swapchain);
136136
return 1;
137137
}
138138

‎examples/sk_gpu_flat/sk_gpu.vcxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ python build_header.py</Command>
122122
</PrecompiledHeader>
123123
<WarningLevel>Level3</WarningLevel>
124124
<SDLCheck>true</SDLCheck>
125-
<PreprocessorDefinitions>SKR_FORCE_OPENGL;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
125+
<PreprocessorDefinitions>SKG_FORCE_DIRECT3D;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
126126
<ConformanceMode>true</ConformanceMode>
127127
</ClCompile>
128128
<Link>

0 commit comments

Comments
 (0)