Update RGFW to 1.6

.github/workflows/windows.yml

@@ -28,35 +28,27 @@ jobs:
       max-parallel: 1
       matrix:
         compiler: [mingw-w64, msvc16]
-        ziptarget: [ win32, win64, winarm64 ]
+        bits: [32, 64]
         include:
         - compiler: mingw-w64
+          bits: 32
           ARCH: "i686"
           WINDRES_ARCH: pe-i386
-          ziptarget: "win32"
         - compiler: mingw-w64
+          bits: 64
           ARCH: "x86_64"
           WINDRES_ARCH: pe-x86-64
-          ziptarget: "win64"
         - compiler: msvc16
+          bits: 32
           ARCH: "x86"
           VSARCHPATH: "Win32" 
-          ziptarget: "win32"
         - compiler: msvc16
+          bits: 64
           ARCH: "x64" 
           VSARCHPATH: "x64"
-          ziptarget: "win64"
-        - compiler: msvc16
-          ARCH: "ARM64"
-          VSARCHPATH: "ARM64"
-          ziptarget: "winarm64"
-        exclude:
-          - compiler: mingw-w64
-            ziptarget: winarm64 # We don't build arm64 with mingw-w64 yet
-
 
     env:
-      RELEASE_NAME: raylib-dev_${{ matrix.ziptarget }}_${{ matrix.compiler }}
+      RELEASE_NAME: raylib-dev_win${{ matrix.bits }}_${{ matrix.compiler }}
       GNUTARGET: default
 
     steps:
@@ -65,7 +57,7 @@ jobs:
 
     - name: Setup Release Version
       run: |
-        echo "RELEASE_NAME=raylib-${{ github.event.release.tag_name }}_${{ matrix.ziptarget }}_${{ matrix.compiler }}" >> $GITHUB_ENV
+        echo "RELEASE_NAME=raylib-${{ github.event.release.tag_name }}_win${{ matrix.bits }}_${{ matrix.compiler }}" >> $GITHUB_ENV
       shell: bash
       if: github.event_name == 'release' && github.event.action == 'published'
 
@@ -98,7 +90,7 @@ jobs:
       shell: cmd
       if: |
         matrix.compiler == 'mingw-w64' &&
-        matrix.arch == 'i686'
+        matrix.bits == 32
 
     - name: Build Library (MinGW-w64 64bit)
       run: |
@@ -113,7 +105,7 @@ jobs:
       shell: cmd
       if: |
         matrix.compiler == 'mingw-w64' &&
-        matrix.arch == 'x86_64'
+        matrix.bits == 64
 
     - name: Build Library (MSVC16)
       run: |

CMakeLists.txt

@@ -37,7 +37,7 @@ include(CompilerFlags)
 # Registers build options that are exposed to cmake
 include(CMakeOptions.txt)
 
-if (UNIX AND NOT APPLE AND NOT "${PLATFORM}" MATCHES "DRM")
+if (UNIX AND NOT APPLE)
   if (NOT GLFW_BUILD_WAYLAND AND NOT GLFW_BUILD_X11)
     MESSAGE(FATAL_ERROR "Cannot disable both Wayland and X11")
   endif()

examples/Makefile

@@ -96,6 +96,7 @@ SDL_INCLUDE_PATH      ?= $(RAYLIB_SRC_PATH)/external/SDL2/include
 SDL_LIBRARY_PATH      ?= $(RAYLIB_SRC_PATH)/external/SDL2/lib
 SDL_LIBRARIES         ?= -lSDL2 -lSDL2main
 
+
 # Use Wayland display server protocol on Linux desktop (by default it uses X11 windowing system)
 # NOTE: This variable is only used for PLATFORM_OS: LINUX
 USE_WAYLAND_DISPLAY   ?= FALSE
@@ -548,6 +549,7 @@ SHAPES = \
     shapes/shapes_splines_drawing \
     shapes/shapes_top_down_lights
 
+
 TEXTURES = \
     textures/textures_background_scrolling \
     textures/textures_blend_modes \
@@ -664,6 +666,7 @@ ifeq ($(TARGET_PLATFORM), PLATFORM_DESKTOP_GFLW)
     OTHERS += others/rlgl_standalone
 endif
 
+
 CURRENT_MAKEFILE = $(lastword $(MAKEFILE_LIST))
 
 # Define processes to execute

examples/core/resources/distortion100.fs

@@ -10,7 +10,7 @@ varying vec4 fragColor;
 uniform sampler2D texture0;
 uniform vec4 colDiffuse;
 
-// NOTE: Add your custom variables here
+// NOTE: Add here your custom variables
 uniform vec2 leftLensCenter;
 uniform vec2 rightLensCenter;
 uniform vec2 leftScreenCenter;

examples/core/resources/distortion330.fs

@@ -11,7 +11,7 @@ uniform vec4 colDiffuse;
 // Output fragment color
 out vec4 finalColor;
 
-// NOTE: Add your custom variables here
+// NOTE: Add here your custom variables
 uniform vec2 leftLensCenter = vec2(0.288, 0.5);
 uniform vec2 rightLensCenter = vec2(0.712, 0.5);
 uniform vec2 leftScreenCenter = vec2(0.25, 0.5);

examples/models/resources/shaders/glsl330/voxel_lighting.fs

@@ -13,7 +13,7 @@ uniform vec4 colDiffuse;
 // Output fragment color
 out vec4 finalColor;
 
-// NOTE: Add your custom variables here
+// NOTE: Add here your custom variables
 
 #define     MAX_LIGHTS              4
 #define     LIGHT_DIRECTIONAL       0

examples/models/resources/shaders/glsl330/voxel_lighting.vs

@@ -17,7 +17,7 @@ out vec3 fragPosition;
 out vec4 fragColor;
 out vec3 fragNormal;
 
-// NOTE: Add your custom variables here
+// NOTE: Add here your custom variables
 
 void main()
 {

examples/others/resources/shaders/glsl100/point_particle.fs

@@ -5,7 +5,7 @@ precision mediump float;
 // Input uniform values
 uniform vec4 color;
 
-// NOTE: Add your custom variables here
+// NOTE: Add here your custom variables
 
 void main()
 {

examples/others/resources/shaders/glsl100/point_particle.vs

@@ -7,7 +7,7 @@ attribute vec3 vertexPosition;
 uniform mat4 mvp;
 uniform float currentTime;
 
-// NOTE: Add your custom variables here
+// NOTE: Add here your custom variables
 
 void main()
 {

examples/others/resources/shaders/glsl330/point_particle.fs

@@ -6,7 +6,7 @@ uniform vec4 color;
 // Output fragment color
 out vec4 finalColor;
 
-// NOTE: Add your custom variables here
+// NOTE: Add here your custom variables
 
 void main()
 {

examples/others/resources/shaders/glsl330/point_particle.vs

@@ -7,7 +7,7 @@ in vec3 vertexPosition;
 uniform mat4 mvp;
 uniform float currentTime;
 
-// NOTE: Add your custom variables here
+// NOTE: Add here your custom variables
 
 void main()
 {

examples/shaders/resources/shaders/glsl100/base.fs

@@ -10,7 +10,7 @@ varying vec4 fragColor;
 uniform sampler2D texture0;
 uniform vec4 colDiffuse;
 
-// NOTE: Add your custom variables here
+// NOTE: Add here your custom variables
 
 void main()
 {

examples/shaders/resources/shaders/glsl100/base.vs

@@ -13,7 +13,7 @@ uniform mat4 mvp;
 varying vec2 fragTexCoord;
 varying vec4 fragColor;
 
-// NOTE: Add your custom variables here
+// NOTE: Add here your custom variables
 
 void main()
 {

examples/shaders/resources/shaders/glsl100/bloom.fs

@@ -10,7 +10,7 @@ varying vec4 fragColor;
 uniform sampler2D texture0;
 uniform vec4 colDiffuse;
 
-// NOTE: Add your custom variables here
+// NOTE: Add here your custom variables
 
 const vec2 size = vec2(800, 450);   // render size
 const float samples = 5.0;          // pixels per axis; higher = bigger glow, worse performance

examples/shaders/resources/shaders/glsl100/blur.fs

@@ -10,7 +10,7 @@ varying vec4 fragColor;
 uniform sampler2D texture0;
 uniform vec4 colDiffuse;
 
-// NOTE: Add your custom variables here
+// NOTE: Add here your custom variables
 
 // NOTE: Render size values must be passed from code
 const float renderWidth = 800.0;

examples/shaders/resources/shaders/glsl100/cross_hatching.fs

@@ -10,7 +10,7 @@ varying vec4 fragColor;
 uniform sampler2D texture0;
 uniform vec4 colDiffuse;
 
-// NOTE: Add your custom variables here
+// NOTE: Add here your custom variables
 
 float hatchOffsetY = 5.0;
 float lumThreshold01 = 0.9;

examples/shaders/resources/shaders/glsl100/cross_stitching.fs

@@ -10,7 +10,7 @@ varying vec4 fragColor;
 uniform sampler2D texture0;
 uniform vec4 colDiffuse;
 
-// NOTE: Add your custom variables here
+// NOTE: Add here your custom variables
 
 // NOTE: Render size values must be passed from code
 const float renderWidth = 800.0;

examples/shaders/resources/shaders/glsl100/depth.fs

@@ -10,7 +10,7 @@ varying vec4 fragColor;
 uniform sampler2D texture0;     // Depth texture
 uniform vec4 colDiffuse;
 
-// NOTE: Add your custom variables here
+// NOTE: Add here your custom variables
 
 void main()
 {

examples/shaders/resources/shaders/glsl100/dream_vision.fs

@@ -10,7 +10,7 @@ varying vec4 fragColor;
 uniform sampler2D texture0;
 uniform vec4 colDiffuse;
 
-// NOTE: Add your custom variables here
+// NOTE: Add here your custom variables
 
 void main()
 {

examples/shaders/resources/shaders/glsl100/fisheye.fs

@@ -10,7 +10,7 @@ varying vec4 fragColor;
 uniform sampler2D texture0;
 uniform vec4 colDiffuse;
 
-// NOTE: Add your custom variables here
+// NOTE: Add here your custom variables
 
 const float PI = 3.1415926535;
 

examples/shaders/resources/shaders/glsl100/fog.fs

@@ -12,7 +12,7 @@ varying vec3 fragNormal;
 uniform sampler2D texture0;
 uniform vec4 colDiffuse;
 
-// NOTE: Add your custom variables here
+// NOTE: Add here your custom variables
 
 #define     MAX_LIGHTS              4
 #define     LIGHT_DIRECTIONAL       0

examples/shaders/resources/shaders/glsl100/grayscale.fs

@@ -10,7 +10,7 @@ varying vec4 fragColor;
 uniform sampler2D texture0;
 uniform vec4 colDiffuse;
 
-// NOTE: Add your custom variables here
+// NOTE: Add here your custom variables
 
 void main()
 {

examples/shaders/resources/shaders/glsl100/lighting.fs

@@ -12,7 +12,7 @@ varying vec3 fragNormal;
 uniform sampler2D texture0;
 uniform vec4 colDiffuse;
 
-// NOTE: Add your custom variables here
+// NOTE: Add here your custom variables
 
 #define     MAX_LIGHTS              4
 #define     LIGHT_DIRECTIONAL       0

examples/shaders/resources/shaders/glsl100/lighting.vs

@@ -16,7 +16,7 @@ varying vec2 fragTexCoord;
 varying vec4 fragColor;
 varying vec3 fragNormal;
 
-// NOTE: Add your custom variables here
+// NOTE: Add here your custom variables
 
 // https://github.com/glslify/glsl-inverse
 mat3 inverse(mat3 m)

examples/shaders/resources/shaders/glsl100/lighting_instancing.vs

@@ -18,7 +18,7 @@ varying vec2 fragTexCoord;
 varying vec4 fragColor;
 varying vec3 fragNormal;
 
-// NOTE: Add your custom variables here
+// NOTE: Add here your custom variables
 
 void main()
 {

examples/shaders/resources/shaders/glsl100/lightmap.vs

@@ -16,7 +16,7 @@ varying vec2 fragTexCoord;
 varying vec2 fragTexCoord2;
 varying vec4 fragColor;
 
-// NOTE: Add your custom variables here
+// NOTE: Add here your custom variables
 
 void main()
 {

examples/shaders/resources/shaders/glsl100/mask.fs

@@ -12,7 +12,7 @@ uniform sampler2D mask;
 uniform vec4 colDiffuse;
 uniform int frame;
 
-// NOTE: Add your custom variables here
+// NOTE: Add here your custom variables
 
 void main()
 {

examples/shaders/resources/shaders/glsl100/pixelizer.fs

@@ -10,7 +10,7 @@ varying vec4 fragColor;
 uniform sampler2D texture0;
 uniform vec4 colDiffuse;
 
-// NOTE: Add your custom variables here
+// NOTE: Add here your custom variables
 
 // NOTE: Render size values must be passed from code
 const float renderWidth = 800.0;

examples/shaders/resources/shaders/glsl100/posterization.fs

@@ -10,7 +10,7 @@ varying vec4 fragColor;
 uniform sampler2D texture0;
 uniform vec4 colDiffuse;
 
-// NOTE: Add your custom variables here
+// NOTE: Add here your custom variables
 
 float gamma = 0.6;
 float numColors = 8.0;

examples/shaders/resources/shaders/glsl100/predator.fs

@@ -10,7 +10,7 @@ varying vec4 fragColor;
 uniform sampler2D texture0;
 uniform vec4 colDiffuse;
 
-// NOTE: Add your custom variables here
+// NOTE: Add here your custom variables
 
 void main()
 {

examples/shaders/resources/shaders/glsl100/scanlines.fs

@@ -10,7 +10,7 @@ varying vec4 fragColor;
 uniform sampler2D texture0;
 uniform vec4 colDiffuse;
 
-// NOTE: Add your custom variables here
+// NOTE: Add here your custom variables
 
 float offset = 0.0;
 float frequency = 450.0/3.0;

examples/shaders/resources/shaders/glsl100/sobel.fs

@@ -10,7 +10,7 @@ varying vec4 fragColor;
 uniform sampler2D texture0;
 uniform vec4 colDiffuse;
 
-// NOTE: Add your custom variables here
+// NOTE: Add here your custom variables
 vec2 resolution = vec2(800.0, 450.0);
 
 void main()

examples/shaders/resources/shaders/glsl100/swirl.fs

@@ -10,7 +10,7 @@ varying vec4 fragColor;
 uniform sampler2D texture0;
 uniform vec4 colDiffuse;
 
-// NOTE: Add your custom variables here
+// NOTE: Add here your custom variables
 
 // NOTE: Render size values should be passed from code
 const float renderWidth = 800.0;

examples/shaders/resources/shaders/glsl100/tiling.fs

@@ -10,7 +10,7 @@ varying vec4 fragColor;
 uniform sampler2D texture0;
 uniform vec4 colDiffuse;
 
-// NOTE: Add your custom variables here
+// NOTE: Add here your custom variables
 uniform vec2 tiling;
 
 void main()

examples/shaders/resources/shaders/glsl120/base.fs

@@ -8,7 +8,7 @@ varying vec4 fragColor;
 uniform sampler2D texture0;
 uniform vec4 colDiffuse;
 
-// NOTE: Add your custom variables here
+// NOTE: Add here your custom variables
 uniform vec2 resolution = vec2(800, 450);
 
 void main()

examples/shaders/resources/shaders/glsl120/base.vs

@@ -13,7 +13,7 @@ uniform mat4 mvp;
 varying vec2 fragTexCoord;
 varying vec4 fragColor;
 
-// NOTE: Add your custom variables here
+// NOTE: Add here your custom variables
 
 void main()
 {