aboutsummaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorAndre Weissflog <floooh@gmail.com>2024-03-10 16:40:39 +0100
committerAndre Weissflog <floooh@gmail.com>2024-03-10 16:40:39 +0100
commitfb77929fb48c1256c24fa6cb758665a3ea7d3130 (patch)
treede91cc7768b72609308d837df7bef1c512c4e2e9 /util
parent71df9eb978b4920d50acf3d3e7f4079becc338c3 (diff)
replace SOKOL_GLCORE33 with SOKOL_GLCORE
Diffstat (limited to 'util')
-rw-r--r--util/sokol_debugtext.h8
-rw-r--r--util/sokol_fontstash.h8
-rw-r--r--util/sokol_gl.h8
-rw-r--r--util/sokol_imgui.h8
-rw-r--r--util/sokol_nuklear.h8
-rw-r--r--util/sokol_spine.h8
6 files changed, 24 insertions, 24 deletions
diff --git a/util/sokol_debugtext.h b/util/sokol_debugtext.h
index cec06946..eda40b39 100644
--- a/util/sokol_debugtext.h
+++ b/util/sokol_debugtext.h
@@ -17,7 +17,7 @@
platform-specific embedded shader code (these are the same defines as
used by sokol_gfx.h and sokol_app.h):
- SOKOL_GLCORE33
+ SOKOL_GLCORE
SOKOL_GLES3
SOKOL_D3D11
SOKOL_METAL
@@ -2405,7 +2405,7 @@ static const uint8_t _sdtx_font_oric[2048] = {
@program debugtext vs fs
*/
-#if defined(SOKOL_GLCORE33)
+#if defined(SOKOL_GLCORE)
static const char _sdtx_vs_source_glsl330[298] = {
0x23,0x76,0x65,0x72,0x73,0x69,0x6f,0x6e,0x20,0x33,0x33,0x30,0x0a,0x0a,0x6c,0x61,
0x79,0x6f,0x75,0x74,0x28,0x6c,0x6f,0x63,0x61,0x74,0x69,0x6f,0x6e,0x20,0x3d,0x20,
@@ -3459,7 +3459,7 @@ static const char _sdtx_fs_source_wgsl[663] = {
static const char* _sdtx_vs_src_dummy = "";
static const char* _sdtx_fs_src_dummy = "";
#else
-#error "Please define one of SOKOL_GLCORE33, SOKOL_GLES3, SOKOL_D3D11, SOKOL_METAL, SOKOL_WGPU or SOKOL_DUMMY_BACKEND!"
+#error "Please define one of SOKOL_GLCORE, SOKOL_GLES3, SOKOL_D3D11, SOKOL_METAL, SOKOL_WGPU or SOKOL_DUMMY_BACKEND!"
#endif
// ███████ ████████ ██████ ██ ██ ██████ ████████ ███████
@@ -3952,7 +3952,7 @@ static void _sdtx_setup_common(void) {
shd_desc.fs.image_sampler_pairs[0].image_slot = 0;
shd_desc.fs.image_sampler_pairs[0].sampler_slot = 0;
shd_desc.fs.image_sampler_pairs[0].glsl_name = "tex_smp";
- #if defined(SOKOL_GLCORE33)
+ #if defined(SOKOL_GLCORE)
shd_desc.vs.source = _sdtx_vs_source_glsl330;
shd_desc.fs.source = _sdtx_fs_source_glsl330;
#elif defined(SOKOL_GLES3)
diff --git a/util/sokol_fontstash.h b/util/sokol_fontstash.h
index 048c8215..8e2fef3a 100644
--- a/util/sokol_fontstash.h
+++ b/util/sokol_fontstash.h
@@ -19,7 +19,7 @@
platform-specific embedded shader code (these are the same defines as
used by sokol_gfx.h and sokol_app.h):
- SOKOL_GLCORE33
+ SOKOL_GLCORE
SOKOL_GLES3
SOKOL_D3D11
SOKOL_METAL
@@ -278,7 +278,7 @@ SOKOL_FONTSTASH_API_DECL uint32_t sfons_rgba(uint8_t r, uint8_t g, uint8_t b, ui
#define _SOKOL_UNUSED(x) (void)(x)
#endif
-#if defined(SOKOL_GLCORE33)
+#if defined(SOKOL_GLCORE)
/*
Embedded source code compiled with:
@@ -1521,7 +1521,7 @@ static const char _sfons_fs_source_wgsl[674] = {
static const char* _sfons_vs_source_dummy = "";
static const char* _sfons_fs_source_dummy = "";
#else
-#error "Please define one of SOKOL_GLCORE33, SOKOL_GLES3, SOKOL_D3D11, SOKOL_METAL, SOKOL_WGPU or SOKOL_DUMMY_BACKEND!"
+#error "Please define one of SOKOL_GLCORE, SOKOL_GLES3, SOKOL_D3D11, SOKOL_METAL, SOKOL_WGPU or SOKOL_DUMMY_BACKEND!"
#endif
typedef struct _sfons_t {
@@ -1601,7 +1601,7 @@ static int _sfons_render_create(void* user_ptr, int width, int height) {
shd_desc.fs.image_sampler_pairs[0].image_slot = 0;
shd_desc.fs.image_sampler_pairs[0].sampler_slot = 0;
shd_desc.label = "sokol-fontstash-shader";
- #if defined(SOKOL_GLCORE33)
+ #if defined(SOKOL_GLCORE)
shd_desc.vs.source = _sfons_vs_source_glsl330;
shd_desc.fs.source = _sfons_fs_source_glsl330;
#elif defined(SOKOL_GLES3)
diff --git a/util/sokol_gl.h b/util/sokol_gl.h
index 997ddea3..6b1e0174 100644
--- a/util/sokol_gl.h
+++ b/util/sokol_gl.h
@@ -17,7 +17,7 @@
platform-specific embedded shader code (these are the same defines as
used by sokol_gfx.h and sokol_app.h):
- SOKOL_GLCORE33
+ SOKOL_GLCORE
SOKOL_GLES3
SOKOL_D3D11
SOKOL_METAL
@@ -1013,7 +1013,7 @@ inline sgl_pipeline sgl_context_make_pipeline(sgl_context ctx, const sg_pipeline
@program sgl vs fs
*/
-#if defined(SOKOL_GLCORE33)
+#if defined(SOKOL_GLCORE)
static const char _sgl_vs_source_glsl330[478] = {
0x23,0x76,0x65,0x72,0x73,0x69,0x6f,0x6e,0x20,0x33,0x33,0x30,0x0a,0x0a,0x75,0x6e,
0x69,0x66,0x6f,0x72,0x6d,0x20,0x76,0x65,0x63,0x34,0x20,0x76,0x73,0x5f,0x70,0x61,
@@ -2202,7 +2202,7 @@ static const char _sgl_fs_source_wgsl[647] = {
static const char* _sgl_vs_source_dummy = "";
static const char* _sgl_fs_source_dummy = "";
#else
-#error "Please define one of SOKOL_GLCORE33, SOKOL_GLES3, SOKOL_D3D11, SOKOL_METAL, SOKOL_WGPU or SOKOL_DUMMY_BACKEND!"
+#error "Please define one of SOKOL_GLCORE, SOKOL_GLES3, SOKOL_D3D11, SOKOL_METAL, SOKOL_WGPU or SOKOL_DUMMY_BACKEND!"
#endif
// ████████ ██ ██ ██████ ███████ ███████
@@ -3284,7 +3284,7 @@ static void _sgl_setup_common(void) {
shd_desc.fs.image_sampler_pairs[0].sampler_slot = 0;
shd_desc.fs.image_sampler_pairs[0].glsl_name = "tex_smp";
shd_desc.label = "sgl-shader";
- #if defined(SOKOL_GLCORE33)
+ #if defined(SOKOL_GLCORE)
shd_desc.vs.source = _sgl_vs_source_glsl330;
shd_desc.fs.source = _sgl_fs_source_glsl330;
#elif defined(SOKOL_GLES3)
diff --git a/util/sokol_imgui.h b/util/sokol_imgui.h
index 9c041eaf..6cb1e53a 100644
--- a/util/sokol_imgui.h
+++ b/util/sokol_imgui.h
@@ -26,7 +26,7 @@
platform-specific embedded shader code (these are the same defines as
used by sokol_gfx.h and sokol_app.h):
- SOKOL_GLCORE33
+ SOKOL_GLCORE
SOKOL_GLES3
SOKOL_D3D11
SOKOL_METAL
@@ -721,7 +721,7 @@ static _simgui_state_t _simgui;
@program simgui vs fs
*/
-#if defined(SOKOL_GLCORE33)
+#if defined(SOKOL_GLCORE)
static const char _simgui_vs_source_glsl330[341] = {
0x23,0x76,0x65,0x72,0x73,0x69,0x6f,0x6e,0x20,0x33,0x33,0x30,0x0a,0x0a,0x75,0x6e,
0x69,0x66,0x6f,0x72,0x6d,0x20,0x76,0x65,0x63,0x34,0x20,0x76,0x73,0x5f,0x70,0x61,
@@ -1838,7 +1838,7 @@ static const char _simgui_fs_source_wgsl[630] = {
static const char* _simgui_vs_source_dummy = "";
static const char* _simgui_fs_source_dummy = "";
#else
-#error "Please define one of SOKOL_GLCORE33, SOKOL_GLES3, SOKOL_D3D11, SOKOL_METAL, SOKOL_WGPU or SOKOL_DUMMY_BACKEND!"
+#error "Please define one of SOKOL_GLCORE, SOKOL_GLES3, SOKOL_D3D11, SOKOL_METAL, SOKOL_WGPU or SOKOL_DUMMY_BACKEND!"
#endif
#if !defined(SOKOL_IMGUI_NO_SOKOL_APP)
@@ -2251,7 +2251,7 @@ SOKOL_API_IMPL void simgui_setup(const simgui_desc_t* desc) {
shd_desc.fs.image_sampler_pairs[0].sampler_slot = 0;
shd_desc.fs.image_sampler_pairs[0].glsl_name = "tex_smp";
shd_desc.label = "sokol-imgui-shader";
- #if defined(SOKOL_GLCORE33)
+ #if defined(SOKOL_GLCORE)
shd_desc.vs.source = _simgui_vs_source_glsl330;
shd_desc.fs.source = _simgui_fs_source_glsl330;
#elif defined(SOKOL_GLES3)
diff --git a/util/sokol_nuklear.h b/util/sokol_nuklear.h
index 04e73eac..9972e133 100644
--- a/util/sokol_nuklear.h
+++ b/util/sokol_nuklear.h
@@ -18,7 +18,7 @@
platform-specific embedded shader code (these are the same defines as
used by sokol_gfx.h and sokol_app.h):
- SOKOL_GLCORE33
+ SOKOL_GLCORE
SOKOL_GLES3
SOKOL_D3D11
SOKOL_METAL
@@ -616,7 +616,7 @@ static _snk_state_t _snuklear;
@program snuk vs fs
*/
-#if defined(SOKOL_GLCORE33)
+#if defined(SOKOL_GLCORE)
static const char _snk_vs_source_glsl330[341] = {
0x23,0x76,0x65,0x72,0x73,0x69,0x6f,0x6e,0x20,0x33,0x33,0x30,0x0a,0x0a,0x75,0x6e,
0x69,0x66,0x6f,0x72,0x6d,0x20,0x76,0x65,0x63,0x34,0x20,0x76,0x73,0x5f,0x70,0x61,
@@ -1732,7 +1732,7 @@ static const char _snk_fs_source_wgsl[630] = {
static const char* _snk_vs_source_dummy = "";
static const char* _snk_fs_source_dummy = "";
#else
-#error "Please define one of SOKOL_GLCORE33, SOKOL_GLES3, SOKOL_D3D11, SOKOL_METAL, SOKOL_WGPU or SOKOL_DUMMY_BACKEND!"
+#error "Please define one of SOKOL_GLCORE, SOKOL_GLES3, SOKOL_D3D11, SOKOL_METAL, SOKOL_WGPU or SOKOL_DUMMY_BACKEND!"
#endif
#if !defined(SOKOL_NUKLEAR_NO_SOKOL_APP)
@@ -2174,7 +2174,7 @@ SOKOL_API_IMPL void snk_setup(const snk_desc_t* desc) {
sg_range fs_bytecode = { .ptr = 0, .size = 0 };
const char* vs_source = 0;
const char* fs_source = 0;
- #if defined(SOKOL_GLCORE33)
+ #if defined(SOKOL_GLCORE)
vs_source = _snk_vs_source_glsl330;
fs_source = _snk_fs_source_glsl330;
#elif defined(SOKOL_GLES3)
diff --git a/util/sokol_spine.h b/util/sokol_spine.h
index f76d2bf4..2b23209b 100644
--- a/util/sokol_spine.h
+++ b/util/sokol_spine.h
@@ -19,7 +19,7 @@
platform-specific embedded shader code (these are the same defines as
used by sokol_gfx.h and sokol_app.h):
- SOKOL_GLCORE33
+ SOKOL_GLCORE
SOKOL_GLES3
SOKOL_D3D11
SOKOL_METAL
@@ -1472,7 +1472,7 @@ SOKOL_SPINE_API_DECL void sspine_set_skin(sspine_instance instance, sspine_skin
@program sspine vs fs
*/
-#if defined(SOKOL_GLCORE33)
+#if defined(SOKOL_GLCORE)
static const char _sspine_vs_source_glsl330[352] = {
0x23,0x76,0x65,0x72,0x73,0x69,0x6f,0x6e,0x20,0x33,0x33,0x30,0x0a,0x0a,0x75,0x6e,
0x69,0x66,0x6f,0x72,0x6d,0x20,0x76,0x65,0x63,0x34,0x20,0x76,0x73,0x5f,0x70,0x61,
@@ -2713,7 +2713,7 @@ static const char _sspine_fs_source_wgsl[1125] = {
static const char* _sspine_vs_source_dummy = "";
static const char* _sspine_fs_source_dummy = "";
#else
-#error "Please define one of SOKOL_GLCORE33, SOKOL_GLES3, SOKOL_D3D11, SOKOL_METAL, SOKOL_WGPU or SOKOL_DUMMY_BACKEND!"
+#error "Please define one of SOKOL_GLCORE, SOKOL_GLES3, SOKOL_D3D11, SOKOL_METAL, SOKOL_WGPU or SOKOL_DUMMY_BACKEND!"
#endif
// ███████ ████████ ██████ ██ ██ ██████ ████████ ███████
@@ -4664,7 +4664,7 @@ static void _sspine_init_shared(void) {
shd_desc.fs.image_sampler_pairs[0].sampler_slot = 0;
shd_desc.fs.image_sampler_pairs[0].glsl_name = "tex_smp";
shd_desc.label = "sspine-shader";
- #if defined(SOKOL_GLCORE33)
+ #if defined(SOKOL_GLCORE)
shd_desc.vs.source = _sspine_vs_source_glsl330;
shd_desc.fs.source = _sspine_fs_source_glsl330;
#elif defined(SOKOL_GLES3)