mirror of
https://github.com/raysan5/raylib.git
synced 2026-04-12 18:19:11 -04:00
REVIEWED: PR #5674
This commit is contained in:
19
src/external/rlsw.h
vendored
19
src/external/rlsw.h
vendored
@ -671,6 +671,7 @@ SWAPI void swClose(void);
|
|||||||
SWAPI bool swResize(int w, int h);
|
SWAPI bool swResize(int w, int h);
|
||||||
SWAPI void swReadPixels(int x, int y, int w, int h, SWformat format, SWtype type, void *pixels);
|
SWAPI void swReadPixels(int x, int y, int w, int h, SWformat format, SWtype type, void *pixels);
|
||||||
SWAPI void swBlitPixels(int xDst, int yDst, int wDst, int hDst, int xSrc, int ySrc, int wSrc, int hSrc, SWformat format, SWtype type, void *pixels);
|
SWAPI void swBlitPixels(int xDst, int yDst, int wDst, int hDst, int xSrc, int ySrc, int wSrc, int hSrc, SWformat format, SWtype type, void *pixels);
|
||||||
|
SWAPI void *swGetColorBuffer(int *width, int *height); // Restored for ESP-IDF compatibility
|
||||||
|
|
||||||
SWAPI void swEnable(SWstate state);
|
SWAPI void swEnable(SWstate state);
|
||||||
SWAPI void swDisable(SWstate state);
|
SWAPI void swDisable(SWstate state);
|
||||||
@ -689,7 +690,6 @@ SWAPI void swClear(uint32_t bitmask);
|
|||||||
SWAPI void swBlendFunc(SWfactor sfactor, SWfactor dfactor);
|
SWAPI void swBlendFunc(SWfactor sfactor, SWfactor dfactor);
|
||||||
SWAPI void swPolygonMode(SWpoly mode);
|
SWAPI void swPolygonMode(SWpoly mode);
|
||||||
SWAPI void swCullFace(SWface face);
|
SWAPI void swCullFace(SWface face);
|
||||||
SWAPI void *swGetColorBuffer(int *width, int *height); // Restored for ESP-IDF compatibility
|
|
||||||
|
|
||||||
SWAPI void swPointSize(float size);
|
SWAPI void swPointSize(float size);
|
||||||
SWAPI void swLineWidth(float width);
|
SWAPI void swLineWidth(float width);
|
||||||
@ -3952,6 +3952,14 @@ void swBlitPixels(int xDst, int yDst, int wDst, int hDst, int xSrc, int ySrc, in
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Get framefuffer pixel data pointer and size
|
||||||
|
void *swGetColorBuffer(int *width, int *height)
|
||||||
|
{
|
||||||
|
if (width != NULL) *width = RLSW.framebuffer.color->width;
|
||||||
|
if (height != NULL) *height = RLSW.framebuffer.color->height;
|
||||||
|
return RLSW.framebuffer.color->pixels;
|
||||||
|
}
|
||||||
|
|
||||||
void swEnable(SWstate state)
|
void swEnable(SWstate state)
|
||||||
{
|
{
|
||||||
switch (state)
|
switch (state)
|
||||||
@ -4201,15 +4209,6 @@ void swCullFace(SWface face)
|
|||||||
RLSW.cullFace = face;
|
RLSW.cullFace = face;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get direct pointer to the default framebuffer's pixel data
|
|
||||||
// Restored for ESP-IDF compatibility - removed in Raylib 6.0 PR #5655
|
|
||||||
void *swGetColorBuffer(int *width, int *height)
|
|
||||||
{
|
|
||||||
if (width) *width = RLSW.colorBuffer->width;
|
|
||||||
if (height) *height = RLSW.colorBuffer->height;
|
|
||||||
return RLSW.colorBuffer->pixels;
|
|
||||||
}
|
|
||||||
|
|
||||||
void swPointSize(float size)
|
void swPointSize(float size)
|
||||||
{
|
{
|
||||||
RLSW.pointRadius = floorf(size*0.5f);
|
RLSW.pointRadius = floorf(size*0.5f);
|
||||||
|
|||||||
12
src/rcore.c
12
src/rcore.c
@ -683,13 +683,11 @@ void InitWindow(int width, int height, const char *title)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// FIX: Initialize render dimensions for embedded platforms
|
// Initialize render dimensions for embedded platforms
|
||||||
// On desktop platforms (GLFW, SDL, etc.), CORE.Window.render.width/height are
|
// NOTE: On desktop platforms (GLFW, SDL, etc.), CORE.Window.render.width/height are set during window creation
|
||||||
// set during window creation. On embedded platforms with no window manager,
|
// On embedded platforms with no window manager, InitPlatform() doesn't set these values, so they should be initialized
|
||||||
// InitPlatform() doesn't set these values, so we initialize them here from
|
// here from screen dimensions (which are set from the InitWindow parameters)
|
||||||
// the screen dimensions (which are set from the InitWindow parameters).
|
if ((CORE.Window.render.width == 0) || (CORE.Window.render.height == 0))
|
||||||
// This fix is required for embedded platforms.
|
|
||||||
if (CORE.Window.render.width == 0 || CORE.Window.render.height == 0)
|
|
||||||
{
|
{
|
||||||
CORE.Window.render.width = CORE.Window.screen.width;
|
CORE.Window.render.width = CORE.Window.screen.width;
|
||||||
CORE.Window.render.height = CORE.Window.screen.height;
|
CORE.Window.render.height = CORE.Window.screen.height;
|
||||||
|
|||||||
Reference in New Issue
Block a user