replace SOKOL_GLCORE33 with SOKOL_GLCORE

floooh · Mar 10, 2024 · e268530 · e268530
1 parent 4ae2a9a
commit e268530
Show file tree

Hide file tree

Showing 20 changed files with 25 additions and 25 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -64,14 +64,14 @@ elseif (SOKOL_USE_EGL_GLES3)
     set(sokol_backend SOKOL_GLES3)
     set(slang "glsl300es")
 elseif (SOKOL_USE_EGL_GL)
-    set(sokol_backend SOKOL_GLCORE33)
+    set(sokol_backend SOKOL_GLCORE)
     set(slang "glsl330")
 else()
     if (FIPS_IOS)
         set(sokol_backend SOKOL_GLES3)
         set(slang "glsl300es")
     else()
-        set(sokol_backend SOKOL_GLCORE33)
+        set(sokol_backend SOKOL_GLCORE)
         set(slang "glsl330")
     endif()
 endif()

diff --git a/README.md b/README.md
@@ -320,7 +320,7 @@ To build one of the sokol-app samples for GL on macOS:
 ```sh
 > cd sokol-samples/sapp
 > ../../sokol-tools-bin/bin/osx/sokol-shdc -i cube-sapp.glsl -o cube-sapp.glsl.h -l glsl330
-> cc cube-sapp.c ../libs/sokol/sokol.m -o cube-sapp -fobjc-arc -DSOKOL_GLCORE33 -I../../sokol -I../libs -framework OpenGL -framework Cocoa -framework AudioToolbox
+> cc cube-sapp.c ../libs/sokol/sokol.m -o cube-sapp -fobjc-arc -DSOKOL_GLCORE -I../../sokol -I../libs -framework OpenGL -framework Cocoa -framework AudioToolbox
 ```
 
 ### Building manually on Windows with MSVC
@@ -348,7 +348,7 @@ To build one of the sokol-app samples for GL on Windows:
 ```sh
 > cd sokol-samples\sapp
 > ..\..\sokol-tools-bin\bin\win32\sokol-shdc -i cube-sapp.glsl -o cube-sapp.glsl.h -l glsl330
-> cl cube-sapp.c ..\libs\sokol\sokol.c /DSOKOL_GLCORE33 /I..\..\sokol /I..\libs kernel32.lib user32.lib gdi32.lib
+> cl cube-sapp.c ..\libs\sokol\sokol.c /DSOKOL_GLCORE /I..\..\sokol /I..\libs kernel32.lib user32.lib gdi32.lib
 ```
 
 ### Building manually on Windows with MSYS2/mingw gcc:
@@ -365,7 +365,7 @@ From the MSYS2 shell:
 > gcc cube-sapp.c ../libs/sokol/sokol.c -o cube-sapp-d3d11 -mwin32 -O2 -DSOKOL_D3D11 -I../../sokol -I ../libs -lkernel32 -luser32 -lshell32 -ldxgi -ld3d11 -lole32 -lgdi32
 > ./cube-sapp-d3d11
 # build and run with GL backend:
-> gcc cube-sapp.c ../libs/sokol/sokol.c -o cube-sapp-gl -mwin32 -O2 -DSOKOL_GLCORE33 -I../../sokol -I ../libs -lkernel32 -luser32 -lshell32 -lgdi32 -lole32
+> gcc cube-sapp.c ../libs/sokol/sokol.c -o cube-sapp-gl -mwin32 -O2 -DSOKOL_GLCORE -I../../sokol -I ../libs -lkernel32 -luser32 -lshell32 -lgdi32 -lole32
 > ./cube-sapp-gl
 ```
 
@@ -384,7 +384,7 @@ need to specify the link libraries manually.
 > clang cube-sapp.c ../libs/sokol/sokol.c -o cube-sapp-d3d11.exe -O2 -DSOKOL_D3D11 -I ../../sokol -I ../libs
 > cube-sapp-d3d11
 # build and run with GL backend:
-> clang cube-sapp.c ../libs/sokol/sokol.c -o cube-sapp-gl.exe -O2 -DSOKOL_GLCORE33 -I ../../sokol -I ../libs
+> clang cube-sapp.c ../libs/sokol/sokol.c -o cube-sapp-gl.exe -O2 -DSOKOL_GLCORE -I ../../sokol -I ../libs
 > cube-sapp-gl
 ```
 
@@ -406,7 +406,7 @@ To build one of the sokol-app samples on Linux:
 ```sh
 > cd sokol-samples/sapp
 > ../../sokol-tools-bin/bin/linux/sokol-shdc -i cube-sapp.glsl -o cube-sapp.glsl.h -l glsl330
-> cc cube-sapp.c ../libs/sokol/sokol.c -o cube-sapp -DSOKOL_GLCORE33 -pthread -I../../sokol -I../libs -lGL -ldl -lm -lX11 -lasound -lXi -lXcursor
+> cc cube-sapp.c ../libs/sokol/sokol.c -o cube-sapp -DSOKOL_GLCORE -pthread -I../../sokol -I../libs -lGL -ldl -lm -lX11 -lasound -lXi -lXcursor
 ```
 
 ### Building for WASM / WebGL2

diff --git a/glfw/arraytex-glfw.c b/glfw/arraytex-glfw.c
@@ -5,7 +5,7 @@
 #define HANDMADE_MATH_NO_SSE
 #include "HandmadeMath.h"
 #define SOKOL_IMPL
-#define SOKOL_GLCORE33
+#define SOKOL_GLCORE
 #include "sokol_gfx.h"
 #include "sokol_log.h"
 #include "glfw_glue.h"

diff --git a/glfw/blend-glfw.c b/glfw/blend-glfw.c
@@ -6,7 +6,7 @@
 #define HANDMADE_MATH_NO_SSE
 #include "HandmadeMath.h"
 #define SOKOL_IMPL
-#define SOKOL_GLCORE33
+#define SOKOL_GLCORE
 #include "sokol_gfx.h"
 #include "sokol_log.h"
 #include "glfw_glue.h"

diff --git a/glfw/bufferoffsets-glfw.c b/glfw/bufferoffsets-glfw.c
@@ -4,7 +4,7 @@
 //  buffer offsets.
 //------------------------------------------------------------------------------
 #define SOKOL_IMPL
-#define SOKOL_GLCORE33
+#define SOKOL_GLCORE
 #include "sokol_gfx.h"
 #include "sokol_log.h"
 #include "glfw_glue.h"

diff --git a/glfw/clear-glfw.c b/glfw/clear-glfw.c
@@ -3,7 +3,7 @@
 //  Simple draw loop, clear default framebuffer.
 //------------------------------------------------------------------------------
 #define SOKOL_IMPL
-#define SOKOL_GLCORE33
+#define SOKOL_GLCORE
 #include "sokol_gfx.h"
 #include "sokol_log.h"
 #include "glfw_glue.h"

diff --git a/glfw/cube-glfw.c b/glfw/cube-glfw.c
@@ -6,7 +6,7 @@
 #define HANDMADE_MATH_NO_SSE
 #include "HandmadeMath.h"
 #define SOKOL_IMPL
-#define SOKOL_GLCORE33
+#define SOKOL_GLCORE
 #include "sokol_gfx.h"
 #include "sokol_log.h"
 #include "glfw_glue.h"

diff --git a/glfw/dyntex-glfw.c b/glfw/dyntex-glfw.c
@@ -6,7 +6,7 @@
 #define HANDMADE_MATH_NO_SSE
 #include "HandmadeMath.h"
 #define SOKOL_IMPL
-#define SOKOL_GLCORE33
+#define SOKOL_GLCORE
 #include "sokol_gfx.h"
 #include "sokol_log.h"
 #include "glfw_glue.h"

diff --git a/glfw/imgui-glfw.cc b/glfw/imgui-glfw.cc
@@ -5,7 +5,7 @@
 //------------------------------------------------------------------------------
 #include "imgui.h"
 #define SOKOL_IMPL
-#define SOKOL_GLCORE33
+#define SOKOL_GLCORE
 #include "sokol_gfx.h"
 #include "sokol_time.h"
 #include "sokol_log.h"

diff --git a/glfw/inject-glfw.c b/glfw/inject-glfw.c
@@ -6,7 +6,7 @@
 #define HANDMADE_MATH_NO_SSE
 #include "HandmadeMath.h"
 #define SOKOL_IMPL
-#define SOKOL_GLCORE33
+#define SOKOL_GLCORE
 #include "sokol_gfx.h"
 #include "sokol_log.h"
 #include "glfw_glue.h"

diff --git a/glfw/instancing-glfw.c b/glfw/instancing-glfw.c
@@ -7,7 +7,7 @@
 #define HANDMADE_MATH_NO_SSE
 #include "HandmadeMath.h"
 #define SOKOL_IMPL
-#define SOKOL_GLCORE33
+#define SOKOL_GLCORE
 #include "sokol_gfx.h"
 #include "sokol_log.h"
 #include "glfw_glue.h"

diff --git a/glfw/mipmap-glfw.c b/glfw/mipmap-glfw.c
@@ -8,7 +8,7 @@
 #define HANDMADE_MATH_NO_SSE
 #include "HandmadeMath.h"
 #define SOKOL_IMPL
-#define SOKOL_GLCORE33
+#define SOKOL_GLCORE
 #include "sokol_gfx.h"
 #include "sokol_log.h"
 #include "glfw_glue.h"

diff --git a/glfw/mrt-glfw.c b/glfw/mrt-glfw.c
@@ -6,7 +6,7 @@
 #define HANDMADE_MATH_NO_SSE
 #include "HandmadeMath.h"
 #define SOKOL_IMPL
-#define SOKOL_GLCORE33
+#define SOKOL_GLCORE
 #include "sokol_gfx.h"
 #include "sokol_log.h"
 #include "glfw_glue.h"

diff --git a/glfw/multiwindow-glfw.c b/glfw/multiwindow-glfw.c
@@ -13,7 +13,7 @@
 #include "HandmadeMath.h"
 #include "flextgl33/flextGL.h"
 #define SOKOL_IMPL
-#define SOKOL_GLCORE33
+#define SOKOL_GLCORE
 #define SOKOL_EXTERNAL_GL_LOADER
 #include "sokol_gfx.h"
 #include "sokol_log.h"

diff --git a/glfw/noninterleaved-glfw.c b/glfw/noninterleaved-glfw.c
@@ -10,7 +10,7 @@
 #define HANDMADE_MATH_NO_SSE
 #include "HandmadeMath.h"
 #define SOKOL_IMPL
-#define SOKOL_GLCORE33
+#define SOKOL_GLCORE
 #include "sokol_gfx.h"
 #include "sokol_log.h"
 #include "glfw_glue.h"

diff --git a/glfw/offscreen-glfw.c b/glfw/offscreen-glfw.c
@@ -6,7 +6,7 @@
 #define HANDMADE_MATH_NO_SSE
 #include "HandmadeMath.h"
 #define SOKOL_IMPL
-#define SOKOL_GLCORE33
+#define SOKOL_GLCORE
 #include "sokol_gfx.h"
 #include "sokol_log.h"
 #include "glfw_glue.h"

diff --git a/glfw/quad-glfw.c b/glfw/quad-glfw.c
@@ -3,7 +3,7 @@
 //  Indexed drawing, explicit vertex attr locations.
 //------------------------------------------------------------------------------
 #define SOKOL_IMPL
-#define SOKOL_GLCORE33
+#define SOKOL_GLCORE
 #include "sokol_gfx.h"
 #include "sokol_log.h"
 #include "glfw_glue.h"

diff --git a/glfw/texcube-glfw.c b/glfw/texcube-glfw.c
@@ -5,7 +5,7 @@
 #define HANDMADE_MATH_NO_SSE
 #include "HandmadeMath.h"
 #define SOKOL_IMPL
-#define SOKOL_GLCORE33
+#define SOKOL_GLCORE
 #include "sokol_gfx.h"
 #include "sokol_log.h"
 #include "glfw_glue.h"

diff --git a/glfw/triangle-glfw.c b/glfw/triangle-glfw.c
@@ -3,7 +3,7 @@
 //  Vertex buffer, simple shader, pipeline state object.
 //------------------------------------------------------------------------------
 #define SOKOL_IMPL
-#define SOKOL_GLCORE33
+#define SOKOL_GLCORE
 #include "sokol_gfx.h"
 #include "sokol_log.h"
 #include "glfw_glue.h"

diff --git a/glfw/uniformarrays-glfw.c b/glfw/uniformarrays-glfw.c
@@ -4,7 +4,7 @@
 //  Tests 'native layout' uniform array handling in the sokol_gfx.h GL backend
 //-----------------------------------------------------------------------------
 #define SOKOL_IMPL
-#define SOKOL_GLCORE33
+#define SOKOL_GLCORE
 #include "sokol_gfx.h"
 #include "sokol_log.h"
 #include "sokol_debugtext.h"