From a8d0595bcd1da3e2faad92e378d8366b5a93ae5e Mon Sep 17 00:00:00 2001 From: Clownacy Date: Thu, 23 Apr 2020 14:38:45 +0100 Subject: [PATCH] Update other backends to current API The only other backend besides the Wii U one to use `render_target` is the SDLTexture one. --- src/Backends/Rendering/OpenGL3.cpp | 4 +++- src/Backends/Rendering/SDLSurface.cpp | 4 +++- src/Backends/Rendering/SDLTexture.cpp | 4 ++-- src/Backends/Rendering/Software.cpp | 4 +++- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/Backends/Rendering/OpenGL3.cpp b/src/Backends/Rendering/OpenGL3.cpp index 9ca2b6a9..656faaaf 100644 --- a/src/Backends/Rendering/OpenGL3.cpp +++ b/src/Backends/Rendering/OpenGL3.cpp @@ -812,8 +812,10 @@ void RenderBackend_DrawScreen(void) // Surface management // ==================== -RenderBackend_Surface* RenderBackend_CreateSurface(unsigned int width, unsigned int height) +RenderBackend_Surface* RenderBackend_CreateSurface(unsigned int width, unsigned int height, bool render_target) { + (void)render_target; + RenderBackend_Surface *surface = (RenderBackend_Surface*)malloc(sizeof(RenderBackend_Surface)); if (surface == NULL) diff --git a/src/Backends/Rendering/SDLSurface.cpp b/src/Backends/Rendering/SDLSurface.cpp index c14d5e9a..78c28549 100644 --- a/src/Backends/Rendering/SDLSurface.cpp +++ b/src/Backends/Rendering/SDLSurface.cpp @@ -101,8 +101,10 @@ void RenderBackend_DrawScreen(void) Backend_PrintError("Couldn't put window surface on screen: %s", SDL_GetError()); } -RenderBackend_Surface* RenderBackend_CreateSurface(unsigned int width, unsigned int height) +RenderBackend_Surface* RenderBackend_CreateSurface(unsigned int width, unsigned int height, bool render_target) { + (void)render_target; + RenderBackend_Surface *surface = (RenderBackend_Surface*)malloc(sizeof(RenderBackend_Surface)); if (surface == NULL) diff --git a/src/Backends/Rendering/SDLTexture.cpp b/src/Backends/Rendering/SDLTexture.cpp index dcb8b2b8..300b9313 100644 --- a/src/Backends/Rendering/SDLTexture.cpp +++ b/src/Backends/Rendering/SDLTexture.cpp @@ -236,14 +236,14 @@ void RenderBackend_DrawScreen(void) SDL_RenderPresent(renderer); } -RenderBackend_Surface* RenderBackend_CreateSurface(unsigned int width, unsigned int height) +RenderBackend_Surface* RenderBackend_CreateSurface(unsigned int width, unsigned int height, bool render_target) { RenderBackend_Surface *surface = (RenderBackend_Surface*)malloc(sizeof(RenderBackend_Surface)); if (surface == NULL) return NULL; - surface->texture = SDL_CreateTexture(renderer, SDL_PIXELFORMAT_RGBA32, SDL_TEXTUREACCESS_TARGET, width, height); + surface->texture = SDL_CreateTexture(renderer, SDL_PIXELFORMAT_RGBA32, render_target ? SDL_TEXTUREACCESS_TARGET : 0, width, height); if (surface->texture == NULL) { diff --git a/src/Backends/Rendering/Software.cpp b/src/Backends/Rendering/Software.cpp index bb4880b3..f80685d5 100644 --- a/src/Backends/Rendering/Software.cpp +++ b/src/Backends/Rendering/Software.cpp @@ -65,8 +65,10 @@ void RenderBackend_DrawScreen(void) framebuffer.pitch = pitch; } -RenderBackend_Surface* RenderBackend_CreateSurface(unsigned int width, unsigned int height) +RenderBackend_Surface* RenderBackend_CreateSurface(unsigned int width, unsigned int height, bool render_target) { + (void)render_target; + RenderBackend_Surface *surface = (RenderBackend_Surface*)malloc(sizeof(RenderBackend_Surface)); if (surface == NULL)