mirror of
https://github.com/raysan5/raylib.git
synced 2026-04-26 08:37:25 -04:00
[Platform/RGFW] add support for software rendering (#5773)
* add support for software rendering * null check on freeing * add back line * rename framebuffer to surface * add guard on free * update makefile to prevent software on web * update for mac
This commit is contained in:
11
src/Makefile
11
src/Makefile
@ -275,11 +275,20 @@ ifeq ($(TARGET_PLATFORM),PLATFORM_DRM)
|
|||||||
GRAPHICS ?= GRAPHICS_API_OPENGL_ES2
|
GRAPHICS ?= GRAPHICS_API_OPENGL_ES2
|
||||||
#GRAPHICS = GRAPHICS_API_OPENGL_SOFTWARE # Uncomment to use software rendering
|
#GRAPHICS = GRAPHICS_API_OPENGL_SOFTWARE # Uncomment to use software rendering
|
||||||
endif
|
endif
|
||||||
ifeq ($(TARGET_PLATFORM),$(filter $(TARGET_PLATFORM),PLATFORM_WEB PLATFORM_WEB_RGFW))
|
ifeq ($(TARGET_PLATFORM),PLATFORM_WEB)
|
||||||
# On HTML5 OpenGL ES 2.0 is used, emscripten translates it to WebGL 1.0
|
# On HTML5 OpenGL ES 2.0 is used, emscripten translates it to WebGL 1.0
|
||||||
GRAPHICS ?= GRAPHICS_API_OPENGL_ES2
|
GRAPHICS ?= GRAPHICS_API_OPENGL_ES2
|
||||||
#GRAPHICS = GRAPHICS_API_OPENGL_ES3
|
#GRAPHICS = GRAPHICS_API_OPENGL_ES3
|
||||||
endif
|
endif
|
||||||
|
ifeq ($(TARGET_PLATFORM),PLATFORM_WEB_RGFW)
|
||||||
|
# On HTML5 OpenGL ES 2.0 is used, emscripten translates it to WebGL 1.0
|
||||||
|
GRAPHICS ?= GRAPHICS_API_OPENGL_ES2
|
||||||
|
#GRAPHICS = GRAPHICS_API_OPENGL_ES3
|
||||||
|
|
||||||
|
ifeq ($(GRAPHICS),GRAPHICS_API_OPENGL_SOFTWARE)
|
||||||
|
$(error WEB_RGFW: Software rendering not supported!)
|
||||||
|
endif
|
||||||
|
endif
|
||||||
ifeq ($(TARGET_PLATFORM),PLATFORM_ANDROID)
|
ifeq ($(TARGET_PLATFORM),PLATFORM_ANDROID)
|
||||||
# By default use OpenGL ES 2.0 on Android
|
# By default use OpenGL ES 2.0 on Android
|
||||||
GRAPHICS ?= GRAPHICS_API_OPENGL_ES2
|
GRAPHICS ?= GRAPHICS_API_OPENGL_ES2
|
||||||
|
|||||||
@ -177,6 +177,13 @@ typedef struct {
|
|||||||
RGFW_window *window; // Native display device (physical screen connection)
|
RGFW_window *window; // Native display device (physical screen connection)
|
||||||
RGFW_monitor *monitor;
|
RGFW_monitor *monitor;
|
||||||
mg_gamepads minigamepad;
|
mg_gamepads minigamepad;
|
||||||
|
|
||||||
|
#if defined(GRAPHICS_API_OPENGL_SOFTWARE)
|
||||||
|
RGFW_surface *surface;
|
||||||
|
u8 *surfacePixels;
|
||||||
|
i32 surfaceWidth;
|
||||||
|
i32 surfaceHeight;
|
||||||
|
#endif
|
||||||
} PlatformData;
|
} PlatformData;
|
||||||
|
|
||||||
//----------------------------------------------------------------------------------
|
//----------------------------------------------------------------------------------
|
||||||
@ -1121,7 +1128,35 @@ void DisableCursor(void)
|
|||||||
// Swap back buffer with front buffer (screen drawing)
|
// Swap back buffer with front buffer (screen drawing)
|
||||||
void SwapScreenBuffer(void)
|
void SwapScreenBuffer(void)
|
||||||
{
|
{
|
||||||
RGFW_window_swapBuffers_OpenGL(platform.window);
|
#if defined(GRAPHICS_API_OPENGL_SOFTWARE)
|
||||||
|
{
|
||||||
|
if (platform.surface)
|
||||||
|
{
|
||||||
|
// copy rlsw pixel data to the surface framebuffer
|
||||||
|
swReadPixels(0, 0, platform.surfaceWidth, platform.surfaceHeight, SW_RGBA, SW_UNSIGNED_BYTE, platform.surfacePixels);
|
||||||
|
|
||||||
|
// Mac wants a different pixel order. I cant seem to get this to work any other way
|
||||||
|
#if defined(__APPLE__)
|
||||||
|
unsigned char temp = 0;
|
||||||
|
unsigned char *p = NULL;
|
||||||
|
for (int i = 0; i < (platform.surfaceWidth * platform.surfaceHeight); i += 1)
|
||||||
|
{
|
||||||
|
p = platform.surfacePixels + (i * 4);
|
||||||
|
temp = p[0];
|
||||||
|
p[0] = p[2];
|
||||||
|
p[2] = temp;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// blit surface to the window
|
||||||
|
RGFW_window_blitSurface(platform.window, platform.surface);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
{
|
||||||
|
RGFW_window_swapBuffers_OpenGL(platform.window);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
//----------------------------------------------------------------------------------
|
//----------------------------------------------------------------------------------
|
||||||
@ -1315,6 +1350,9 @@ void PollInputEvents(void)
|
|||||||
// Window events are also polled (Minimized, maximized, close...)
|
// Window events are also polled (Minimized, maximized, close...)
|
||||||
case RGFW_windowResized:
|
case RGFW_windowResized:
|
||||||
{
|
{
|
||||||
|
// set flag that the window was resized
|
||||||
|
CORE.Window.resizedLastFrame = true;
|
||||||
|
|
||||||
#if defined(__APPLE__)
|
#if defined(__APPLE__)
|
||||||
if (FLAG_IS_SET(CORE.Window.flags, FLAG_WINDOW_HIGHDPI))
|
if (FLAG_IS_SET(CORE.Window.flags, FLAG_WINDOW_HIGHDPI))
|
||||||
{
|
{
|
||||||
@ -1363,7 +1401,42 @@ void PollInputEvents(void)
|
|||||||
CORE.Window.currentFbo.width = CORE.Window.screen.width;
|
CORE.Window.currentFbo.width = CORE.Window.screen.width;
|
||||||
CORE.Window.currentFbo.height = CORE.Window.screen.height;
|
CORE.Window.currentFbo.height = CORE.Window.screen.height;
|
||||||
#endif
|
#endif
|
||||||
CORE.Window.resizedLastFrame = true;
|
|
||||||
|
#if defined(GRAPHICS_API_OPENGL_SOFTWARE)
|
||||||
|
#if defined(__APPLE__)
|
||||||
|
RGFW_monitor* currentMonitor = RGFW_window_getMonitor(platform.window);
|
||||||
|
CORE.Window.screenScale = MatrixScale(currentMonitor->pixelRatio, currentMonitor->pixelRatio, 1.0f);
|
||||||
|
SetupViewport(platform.window->w * currentMonitor->pixelRatio, platform.window->h * currentMonitor->pixelRatio);
|
||||||
|
|
||||||
|
CORE.Window.render.width = CORE.Window.screen.width * currentMonitor->pixelRatio;
|
||||||
|
CORE.Window.render.height = CORE.Window.screen.height * currentMonitor->pixelRatio;
|
||||||
|
CORE.Window.currentFbo.width = CORE.Window.render.width;
|
||||||
|
CORE.Window.currentFbo.height = CORE.Window.render.height;
|
||||||
|
#endif
|
||||||
|
platform.surfaceWidth = CORE.Window.currentFbo.width;
|
||||||
|
platform.surfaceHeight = CORE.Window.currentFbo.height;
|
||||||
|
|
||||||
|
// in software mode we dont have the viewport so we need to reverse the highdpi changes
|
||||||
|
if (FLAG_IS_SET(CORE.Window.flags, FLAG_WINDOW_HIGHDPI))
|
||||||
|
{
|
||||||
|
Vector2 scaleDpi = GetWindowScaleDPI();
|
||||||
|
platform.surfaceWidth *= scaleDpi.x;
|
||||||
|
platform.surfaceHeight *= scaleDpi.y;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (platform.surfacePixels != NULL)
|
||||||
|
{
|
||||||
|
RL_FREE(platform.surfacePixels);
|
||||||
|
platform.surfacePixels = RL_MALLOC(platform.surfaceWidth * platform.surfaceHeight * 4);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (platform.surface != NULL)
|
||||||
|
{
|
||||||
|
RGFW_surface_free(platform.surface);
|
||||||
|
platform.surface = RGFW_window_createSurface(platform.window, platform.surfacePixels, platform.surfaceWidth, platform.surfaceHeight, RGFW_formatBGRA8);
|
||||||
|
swResize(platform.surfaceWidth, platform.surfaceHeight);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
} break;
|
} break;
|
||||||
case RGFW_windowMaximized:
|
case RGFW_windowMaximized:
|
||||||
{
|
{
|
||||||
@ -1641,6 +1714,12 @@ int InitPlatform(void)
|
|||||||
hints->major = 4;
|
hints->major = 4;
|
||||||
hints->minor = 3;
|
hints->minor = 3;
|
||||||
}
|
}
|
||||||
|
else if (rlGetVersion() == RL_OPENGL_SOFTWARE)
|
||||||
|
{
|
||||||
|
hints->major = 1;
|
||||||
|
hints->minor = 1;
|
||||||
|
hints->renderer = RGFW_glSoftware;
|
||||||
|
}
|
||||||
|
|
||||||
if (FLAG_IS_SET(CORE.Window.flags, FLAG_MSAA_4X_HINT)) hints->samples = 4;
|
if (FLAG_IS_SET(CORE.Window.flags, FLAG_MSAA_4X_HINT)) hints->samples = 4;
|
||||||
|
|
||||||
@ -1720,6 +1799,39 @@ int InitPlatform(void)
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if defined(GRAPHICS_API_OPENGL_SOFTWARE)
|
||||||
|
// apple always scales for retina
|
||||||
|
#if defined(__APPLE__)
|
||||||
|
RGFW_monitor* currentMonitor = RGFW_window_getMonitor(platform.window);
|
||||||
|
CORE.Window.screenScale = MatrixScale(currentMonitor->pixelRatio, currentMonitor->pixelRatio, 1.0f);
|
||||||
|
|
||||||
|
CORE.Window.render.width = CORE.Window.screen.width * currentMonitor->pixelRatio;
|
||||||
|
CORE.Window.render.height = CORE.Window.screen.height * currentMonitor->pixelRatio;
|
||||||
|
CORE.Window.currentFbo.width = CORE.Window.render.width;
|
||||||
|
CORE.Window.currentFbo.height = CORE.Window.render.height;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
platform.surfaceWidth = CORE.Window.currentFbo.width;
|
||||||
|
platform.surfaceHeight = CORE.Window.currentFbo.height;
|
||||||
|
|
||||||
|
platform.surfacePixels = RL_MALLOC(platform.surfaceWidth * platform.surfaceHeight * 4);
|
||||||
|
if (platform.surfacePixels == NULL)
|
||||||
|
{
|
||||||
|
TRACELOG(LOG_FATAL, "PLATFORM: Failed to initialize software pixel buffer");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
platform.surface = RGFW_window_createSurface(platform.window, platform.surfacePixels, platform.surfaceWidth, platform.surfaceHeight, RGFW_formatBGRA8);
|
||||||
|
|
||||||
|
if (platform.surface == NULL)
|
||||||
|
{
|
||||||
|
RL_FREE(platform.surfacePixels);
|
||||||
|
|
||||||
|
TRACELOG(LOG_FATAL, "PLATFORM: Failed to initialize software surface");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
TRACELOG(LOG_INFO, "DISPLAY: Device initialized successfully %s",
|
TRACELOG(LOG_INFO, "DISPLAY: Device initialized successfully %s",
|
||||||
FLAG_IS_SET(CORE.Window.flags, FLAG_WINDOW_HIGHDPI)? "(HighDPI)" : "");
|
FLAG_IS_SET(CORE.Window.flags, FLAG_WINDOW_HIGHDPI)? "(HighDPI)" : "");
|
||||||
TRACELOG(LOG_INFO, " > Display size: %i x %i", CORE.Window.display.width, CORE.Window.display.height);
|
TRACELOG(LOG_INFO, " > Display size: %i x %i", CORE.Window.display.width, CORE.Window.display.height);
|
||||||
@ -1750,20 +1862,63 @@ int InitPlatform(void)
|
|||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
|
|
||||||
#if defined(RGFW_WAYLAND)
|
#if defined(RGFW_WAYLAND)
|
||||||
if (RGFW_usingWayland()) TRACELOG(LOG_INFO, "PLATFORM: DESKTOP (RGFW - Wayland): Initialized successfully");
|
if (rlGetVersion() == RL_OPENGL_SOFTWARE)
|
||||||
else TRACELOG(LOG_INFO, "PLATFORM: DESKTOP (RGFW - X11 (fallback)): Initialized successfully");
|
{
|
||||||
|
if (RGFW_usingWayland()) TRACELOG(LOG_INFO, "PLATFORM: DESKTOP (RGFW - Wayland, Software): Initialized successfully");
|
||||||
|
else TRACELOG(LOG_INFO, "PLATFORM: DESKTOP (RGFW - X11, Software (fallback)): Initialized successfully");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (RGFW_usingWayland()) TRACELOG(LOG_INFO, "PLATFORM: DESKTOP (RGFW - Wayland): Initialized successfully");
|
||||||
|
else TRACELOG(LOG_INFO, "PLATFORM: DESKTOP (RGFW - X11 (fallback)): Initialized successfully");
|
||||||
|
}
|
||||||
#elif defined(RGFW_X11)
|
#elif defined(RGFW_X11)
|
||||||
#if defined(__APPLE__)
|
#if defined(__APPLE__)
|
||||||
TRACELOG(LOG_INFO, "PLATFORM: DESKTOP (RGFW - X11 (MacOS)): Initialized successfully");
|
if (rlGetVersion() == RL_OPENGL_SOFTWARE)
|
||||||
|
{
|
||||||
|
TRACELOG(LOG_INFO, "PLATFORM: DESKTOP (RGFW - X11, Software, (MacOS)): Initialized successfully");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
TRACELOG(LOG_INFO, "PLATFORM: DESKTOP (RGFW - X11, (MacOS)): Initialized successfully");
|
||||||
|
}
|
||||||
#else
|
#else
|
||||||
TRACELOG(LOG_INFO, "PLATFORM: DESKTOP (RGFW - X11): Initialized successfully");
|
if (rlGetVersion() == RL_OPENGL_SOFTWARE)
|
||||||
|
{
|
||||||
|
TRACELOG(LOG_INFO, "PLATFORM: DESKTOP (RGFW - X11, Software): Initialized successfully");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
TRACELOG(LOG_INFO, "PLATFORM: DESKTOP (RGFW - X11): Initialized successfully");
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
#elif defined (RGFW_WINDOWS)
|
#elif defined (RGFW_WINDOWS)
|
||||||
TRACELOG(LOG_INFO, "PLATFORM: DESKTOP (RGFW - Win32): Initialized successfully");
|
if (rlGetVersion() == RL_OPENGL_SOFTWARE)
|
||||||
|
{
|
||||||
|
TRACELOG(LOG_INFO, "PLATFORM: DESKTOP (RGFW - Win32, Software): Initialized successfully");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
TRACELOG(LOG_INFO, "PLATFORM: DESKTOP (RGFW - Win32): Initialized successfully");
|
||||||
|
}
|
||||||
#elif defined(RGFW_WASM)
|
#elif defined(RGFW_WASM)
|
||||||
TRACELOG(LOG_INFO, "PLATFORM: DESKTOP (RGFW - WASMs): Initialized successfully");
|
if (rlGetVersion() == RL_OPENGL_SOFTWARE)
|
||||||
|
{
|
||||||
|
TRACELOG(LOG_INFO, "PLATFORM: DESKTOP (RGFW - WASMs, Software): Initialized successfully");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
TRACELOG(LOG_INFO, "PLATFORM: DESKTOP (RGFW - WASMs): Initialized successfully");
|
||||||
|
}
|
||||||
#elif defined(RGFW_MACOS)
|
#elif defined(RGFW_MACOS)
|
||||||
TRACELOG(LOG_INFO, "PLATFORM: DESKTOP (RGFW - MacOS): Initialized successfully");
|
if (rlGetVersion() == RL_OPENGL_SOFTWARE)
|
||||||
|
{
|
||||||
|
TRACELOG(LOG_INFO, "PLATFORM: DESKTOP (RGFW - MacOS, Software): Initialized successfully");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
TRACELOG(LOG_INFO, "PLATFORM: DESKTOP (RGFW - MacOS): Initialized successfully");
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
mg_gamepads_init(&platform.minigamepad);
|
mg_gamepads_init(&platform.minigamepad);
|
||||||
@ -1776,6 +1931,18 @@ void ClosePlatform(void)
|
|||||||
{
|
{
|
||||||
mg_gamepads_free(&platform.minigamepad);
|
mg_gamepads_free(&platform.minigamepad);
|
||||||
RGFW_window_close(platform.window);
|
RGFW_window_close(platform.window);
|
||||||
|
|
||||||
|
#if defined(GRAPHICS_API_OPENGL_SOFTWARE)
|
||||||
|
if (platform.surfacePixels != NULL)
|
||||||
|
{
|
||||||
|
RL_FREE(platform.surfacePixels);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (platform.surface != NULL)
|
||||||
|
{
|
||||||
|
RGFW_surface_free(platform.surface);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
// Keycode mapping
|
// Keycode mapping
|
||||||
|
|||||||
Reference in New Issue
Block a user