From fb4eec93b2ab5deb427c55d6ab2a4c03896b847b Mon Sep 17 00:00:00 2001
From: David Delassus <david.jose.delassus@gmail.com>
Date: Mon, 5 May 2025 02:27:41 +0200
Subject: [PATCH] [Renderers/SDL3] Use `SDL_Texture` instead of `SDL_Surface`
 for images (#402)

---
 examples/SDL3-simple-demo/main.c    | 59 +++++++++++++++++++++++++++--
 renderers/SDL3/clay_renderer_SDL3.c |  5 +--
 2 files changed, 57 insertions(+), 7 deletions(-)

diff --git a/examples/SDL3-simple-demo/main.c b/examples/SDL3-simple-demo/main.c
index e632b20..cec629f 100644
--- a/examples/SDL3-simple-demo/main.c
+++ b/examples/SDL3-simple-demo/main.c
@@ -23,7 +23,8 @@ typedef struct app_state {
     ClayVideoDemo_Data demoData;
 } AppState;
 
-SDL_Surface *sample_image;
+SDL_Texture *sample_image;
+bool show_demo = true;
 
 static inline Clay_Dimensions SDL_MeasureText(Clay_StringSlice text, Clay_TextElementConfig *config, void *userData)
 {
@@ -42,6 +43,42 @@ void HandleClayErrors(Clay_ErrorData errorData) {
     printf("%s", errorData.errorText.chars);
 }
 
+
+Clay_RenderCommandArray ClayImageSample_CreateLayout() {
+    Clay_BeginLayout();
+
+    Clay_Sizing layoutExpand = {
+        .width = CLAY_SIZING_GROW(0),
+        .height = CLAY_SIZING_GROW(0)
+    };
+
+    CLAY({ .id = CLAY_ID("OuterContainer"),
+        .layout = {
+            .layoutDirection = CLAY_TOP_TO_BOTTOM,
+            .sizing = layoutExpand,
+            .padding = CLAY_PADDING_ALL(16),
+            .childGap = 16
+        }
+    }) {
+        CLAY({
+            .id = CLAY_ID("SampleImage"),
+            .layout = {
+                .sizing = layoutExpand
+            },
+            .image = {
+                .imageData = sample_image,
+                .sourceDimensions = {
+                    .width = 23,
+                    .height = 42
+                },
+            }
+        });
+    }
+
+    return Clay_EndLayout();
+}
+
+
 SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
 {
     (void) argc;
@@ -83,7 +120,11 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[])
 
     state->rendererData.fonts[FONT_ID] = font;
 
-    sample_image = IMG_Load("resources/sample.png");
+    sample_image = IMG_LoadTexture(state->rendererData.renderer, "resources/sample.png");
+    if (!sample_image) {
+        SDL_LogError(SDL_LOG_CATEGORY_ERROR, "Failed to load image: %s", SDL_GetError());
+        return SDL_APP_FAILURE;
+    }
 
     /* Initialize Clay */
     uint64_t totalMemorySize = Clay_MinMemorySize();
@@ -111,6 +152,11 @@ SDL_AppResult SDL_AppEvent(void *appstate, SDL_Event *event)
         case SDL_EVENT_QUIT:
             ret_val = SDL_APP_SUCCESS;
             break;
+        case SDL_EVENT_KEY_UP:
+            if (event->key.scancode == SDL_SCANCODE_SPACE) {
+                show_demo = !show_demo;
+            }
+            break;
         case SDL_EVENT_WINDOW_RESIZED:
             Clay_SetLayoutDimensions((Clay_Dimensions) { (float) event->window.data1, (float) event->window.data2 });
             break;
@@ -136,7 +182,10 @@ SDL_AppResult SDL_AppIterate(void *appstate)
 {
     AppState *state = appstate;
 
-    Clay_RenderCommandArray render_commands = ClayVideoDemo_CreateLayout(&state->demoData);
+    Clay_RenderCommandArray render_commands = (show_demo
+        ? ClayVideoDemo_CreateLayout(&state->demoData)
+        : ClayImageSample_CreateLayout()
+    );
 
     SDL_SetRenderDrawColor(state->rendererData.renderer, 0, 0, 0, 255);
     SDL_RenderClear(state->rendererData.renderer);
@@ -158,6 +207,10 @@ void SDL_AppQuit(void *appstate, SDL_AppResult result)
 
     AppState *state = appstate;
 
+    if (sample_image) {
+        SDL_DestroyTexture(sample_image);
+    }
+
     if (state) {
         if (state->rendererData.renderer)
             SDL_DestroyRenderer(state->rendererData.renderer);
diff --git a/renderers/SDL3/clay_renderer_SDL3.c b/renderers/SDL3/clay_renderer_SDL3.c
index 0a6f3dc..b918c97 100644
--- a/renderers/SDL3/clay_renderer_SDL3.c
+++ b/renderers/SDL3/clay_renderer_SDL3.c
@@ -251,12 +251,9 @@ static void SDL_Clay_RenderClayCommands(Clay_SDL3RendererData *rendererData, Cla
                 break;
             }
             case CLAY_RENDER_COMMAND_TYPE_IMAGE: {
-                SDL_Surface *image = (SDL_Surface *)rcmd->renderData.image.imageData;
-                SDL_Texture *texture = SDL_CreateTextureFromSurface(rendererData->renderer, image);
+                SDL_Texture *texture = (SDL_Texture *)rcmd->renderData.image.imageData;
                 const SDL_FRect dest = { rect.x, rect.y, rect.w, rect.h };
-
                 SDL_RenderTexture(rendererData->renderer, texture, NULL, &dest);
-                SDL_DestroyTexture(texture);
                 break;
             }
             default: