REVIEWED: `rlsw` module and related files

src/platforms/rcore_desktop_sdl.c

@@ -1233,7 +1233,7 @@ void SwapScreenBuffer(void)
 {
 #if defined(GRAPHICS_API_OPENGL_11_SOFTWARE)
     // NOTE: We use a preprocessor condition here because `rlCopyFramebuffer` is only declared for software rendering
-    SDL_Surface* surface = SDL_GetWindowSurface(platform.window);
+    SDL_Surface *surface = SDL_GetWindowSurface(platform.window);
     rlCopyFramebuffer(0, 0, CORE.Window.render.width, CORE.Window.render.height, PIXELFORMAT_UNCOMPRESSED_R8G8B8A8, surface->pixels);
     SDL_UpdateWindowSurface(platform.window);
 #else

src/platforms/rcore_drm.c

@@ -818,14 +818,14 @@ void SwapScreenBuffer(void)
     platform.prevBO = bo;
 #else
     // Software rendering buffer swap
-    if ((o">-1 == platform.fd) || !platform.connector || (platform.modeIndex < 0))
+    if ((n">platform.fd == -1) || !platform.connector || (platform.modeIndex < 0))
     {
         TRACELOG(LOG_ERROR, "DISPLAY: DRM initialization failed to swap");
         return;
     }
 
     // Get the software rendered color buffer
-    int bufferWidth, bufferHeight;
+    int bufferWidth = 0, bufferHeight = 0;
     void *colorBuffer = swGetColorBuffer(&bufferWidth, &bufferHeight);
     if (!colorBuffer)
     {
@@ -849,7 +849,7 @@ void SwapScreenBuffer(void)
 #endif
 
     // Create a dumb buffer for software rendering
-    struct drm_mode_create_dumb creq = {0};
+    struct drm_mode_create_dumb creq = { 0 };
     creq.width = width;
     creq.height = height;
     creq.bpp = bpp;
@@ -863,28 +863,25 @@ void SwapScreenBuffer(void)
 
     // Create framebuffer with the correct format
     uint32_t fb = 0;
-    result = drmModeAddFB(platform.fd, 
-                        width, height,
-                        depth, bpp, creq.pitch, 
-                        creq.handle, &fb);
+    result = drmModeAddFB(platform.fd, width, height, depth, bpp, creq.pitch, creq.handle, &fb);
     if (result != 0) 
     {
         TRACELOG(LOG_ERROR, "DISPLAY: drmModeAddFB() failed with result: %d (%s)", result, strerror(errno));
-        struct drm_mode_destroy_dumb dreq = {0};
+        struct drm_mode_destroy_dumb dreq = { 0 };
         dreq.handle = creq.handle;
         drmIoctl(platform.fd, DRM_IOCTL_MODE_DESTROY_DUMB, &dreq);
         return;
     }
 
     // Map the dumb buffer to copy our software rendered buffer
-    struct drm_mode_map_dumb mreq = {0};
+    struct drm_mode_map_dumb mreq = { 0 };
     mreq.handle = creq.handle;
     result = drmIoctl(platform.fd, DRM_IOCTL_MODE_MAP_DUMB, &mreq);
     if (result != 0)
     {
         TRACELOG(LOG_ERROR, "DISPLAY: Failed to map dumb buffer: %s", strerror(errno));
         drmModeRmFB(platform.fd, fb);
-        struct drm_mode_destroy_dumb dreq = {0};
+        struct drm_mode_destroy_dumb dreq = { 0 };
         dreq.handle = creq.handle;
         drmIoctl(platform.fd, DRM_IOCTL_MODE_DESTROY_DUMB, &dreq);
         return;
@@ -896,7 +893,7 @@ void SwapScreenBuffer(void)
     {
         TRACELOG(LOG_ERROR, "DISPLAY: Failed to mmap dumb buffer: %s", strerror(errno));
         drmModeRmFB(platform.fd, fb);
-        struct drm_mode_destroy_dumb dreq = {0};
+        struct drm_mode_destroy_dumb dreq = { 0 };
         dreq.handle = creq.handle;
         drmIoctl(platform.fd, DRM_IOCTL_MODE_DESTROY_DUMB, &dreq);
         return;
@@ -919,10 +916,7 @@ void SwapScreenBuffer(void)
 
     // Find a CRTC compatible with the connector
     uint32_t crtcId = 0;
-    if (platform.crtc)
-    {
-        crtcId = platform.crtc->crtc_id;
-    }
+    if (platform.crtc) crtcId = platform.crtc->crtc_id;
     else
     {
         // Find a CRTC that's compatible with this connector
@@ -939,10 +933,7 @@ void SwapScreenBuffer(void)
 
         // Check which CRTCs are compatible with this connector
         drmModeEncoder *encoder = NULL;
-        if (platform.connector->encoder_id)
-        {
-            encoder = drmModeGetEncoder(platform.fd, platform.connector->encoder_id);
-        }
+        if (platform.connector->encoder_id) encoder = drmModeGetEncoder(platform.fd, platform.connector->encoder_id);
 
         if (encoder && encoder->crtc_id)
         {
@@ -962,6 +953,7 @@ void SwapScreenBuffer(void)
                     platform.crtc = crtc;
                     break;
                 }
+
                 if (crtc) drmModeFreeCrtc(crtc);
             }
         }
@@ -981,9 +973,7 @@ void SwapScreenBuffer(void)
     }
 
     // Set CRTC with better error handling
-    result = drmModeSetCrtc(platform.fd, crtcId, fb, 0, 0, 
-                        &platform.connector->connector_id, 1, 
-                        mode);
+    result = drmModeSetCrtc(platform.fd, crtcId, fb, 0, 0, &platform.connector->connector_id, 1, mode);
     if (result != 0) 
     {
         TRACELOG(LOG_ERROR, "DISPLAY: drmModeSetCrtc() failed with result: %d (%s)", result, strerror(errno));
@@ -1001,10 +991,7 @@ void SwapScreenBuffer(void)
     if (platform.prevFB)
     {
         result = drmModeRmFB(platform.fd, platform.prevFB);
-        if (result != 0) 
-        {
-            TRACELOG(LOG_WARNING, "DISPLAY: drmModeRmFB() failed with result: %d", result);
-        }
+        if (result != 0) TRACELOG(LOG_WARNING, "DISPLAY: drmModeRmFB() failed with result: %d", result);
     }
 
     platform.prevFB = fb;
@@ -1249,7 +1236,7 @@ int InitPlatform(void)
         // In certain cases the status of the conneciton is reported as UKNOWN, but it is still connected
         // This might be a hardware or software limitation like on Raspberry Pi Zero with composite output
         // WARNING: Accept CONNECTED, UNKNOWN and even those without encoder_id connectors for software mode
-        if (((con->connection == DRM_MODE_CONNECTED) || (con->connection == DRM_MODE_UNKNOWNCONNECTION)) && (con->count_modes > 0)o">//(con->encoder_id))
+        if (((con->connection == DRM_MODE_CONNECTED) || (con->connection == DRM_MODE_UNKNOWNCONNECTION)) && (con->count_modes > 0))
         {
 #if !defined(GRAPHICS_API_OPENGL_11_SOFTWARE)
             // For hardware rendering, we need an encoder_id
@@ -1259,10 +1246,7 @@ int InitPlatform(void)
                 platform.connector = con;
                 break;
             }
-            else
-            {
-                TRACELOG(LOG_TRACE, "DISPLAY: DRM connector %i connected but no encoder", i);
-            }
+            else TRACELOG(LOG_TRACE, "DISPLAY: DRM connector %i connected but no encoder", i);
 #else
             // For software rendering, we can accept even without encoder_id
             TRACELOG(LOG_TRACE, "DISPLAY: DRM connector %i suitable for software rendering", i);

src/rlgl.h

@@ -776,8 +776,8 @@ RLAPI void rlFramebufferAttach(unsigned int fboId, unsigned int texId, int attac
 RLAPI bool rlFramebufferComplete(unsigned int id);                        // Verify framebuffer is complete
 RLAPI void rlUnloadFramebuffer(unsigned int id);                          // Delete framebuffer from GPU
 #if defined(GRAPHICS_API_OPENGL_11_SOFTWARE)
-RLAPI void rlCopyFramebuffer(int x, int y, int w, int h, int format, void* pixels);
-RLAPI void rlResizeFramebuffer(int width, int height);
+RLAPI void rlCopyFramebuffer(int x, int y, int width, int height, int format, void *pixels); // Copy framebuffer pixel data to internal buffer
+RLAPI void rlResizeFramebuffer(int width, int height);                    // Resize internal framebuffer
 #endif
 
 // Shaders management
@@ -846,7 +846,7 @@ RLAPI void rlLoadDrawQuad(void);     // Load and draw a quad
 
 #if defined(GRAPHICS_API_OPENGL_11)
     #if defined(GRAPHICS_API_OPENGL_11_SOFTWARE)
-        #define RLSW_IMPL
+        #define RLSW_IMPLEMENTATION
         #define SW_MALLOC(sz) RL_MALLOC(sz)
         #define SW_REALLOC(ptr, newSz) RL_REALLOC(ptr, newSz)
         #define SW_FREE(ptr) RL_FREE(ptr)
@@ -2357,9 +2357,10 @@ void rlglInit(int width, int height)
 #endif
 
 #if defined(GRAPHICS_API_OPENGL_11_SOFTWARE)
-    if (!swInit(width, height))
+    int result = swInit(width, height); // Initialize software renderer backend
+    if (result == 0)
     {
-        TRACELOG(RL_LOG_ERROR, "RLGL: Software renderer initialization failed!");
+        TRACELOG(RL_LOG_ERROR, "RLSW: Software renderer initialization failed!");
         exit(-1);
     }
 #endif
@@ -2385,14 +2386,14 @@ void rlglClose(void)
 #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2)
     rlUnloadRenderBatch(RLGL.defaultBatch);
 
-    rlUnloadShaderDefault();          // Unload default shader
+    rlUnloadShaderDefault(); // Unload default shader
 
     glDeleteTextures(1, &RLGL.State.defaultTextureId); // Unload default texture
     TRACELOG(RL_LOG_INFO, "TEXTURE: [ID %i] Default texture unloaded successfully", RLGL.State.defaultTextureId);
 #endif
 
 #if defined(GRAPHICS_API_OPENGL_11_SOFTWARE)
-    swClose();
+    swClose(); // Unload sofware renderer resources
 #endif
 }
 
@@ -2703,6 +2704,7 @@ void *rlGetProcAddress(const char *procName)
 int rlGetVersion(void)
 {
     int glVersion = 0;
+
 #if defined(GRAPHICS_API_OPENGL_11_SOFTWARE)
     glVersion = RL_OPENGL_11_SOFTWARE;
 #elif defined(GRAPHICS_API_OPENGL_11)
@@ -3747,13 +3749,15 @@ void *rlReadTexturePixels(unsigned int id, int width, int height, int format)
 }
 
 #if defined(GRAPHICS_API_OPENGL_11_SOFTWARE)
-void rlCopyFramebuffer(int x, int y, int w, int h, int format, void* pixels)
+// Copy framebuffer pixel data to internal buffer
+void rlCopyFramebuffer(int x, int y, int width, int height, int format, void* pixels)
 {
     unsigned int glInternalFormat, glFormat, glType;
-    rlGetGlTextureFormats(format, &glInternalFormat, &glFormat, &glType);
-    swCopyFramebuffer(x, y, w, h, glFormat, glType, pixels);
+    rlGetGlTextureFormats(format, &glInternalFormat, &glFormat, &glType); // Get OpenGL texture format
+    swCopyFramebuffer(x, y, width, height, glFormat, glType, pixels);
 }
 
+// Resize internal framebuffer
 void rlResizeFramebuffer(int width, int height)
 {
     swResizeFramebuffer(width, height);