libretro/RetroArch
1
0 Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2026-11-07 08:36:02 -10:00
Code Issues Packages Projects Releases 1 Wiki Activity

gfx/gl1: rename gl1_t::video_{width,height,pitch,bits} to frame_*

Browse Source 
The four `video_*` fields on gl1_t hold the *core's emulated frame
size* — the dimensions of the pixel buffer the libretro core hands
to gl1_frame, e.g. 256x224 for SNES.  They are not the window size,
not the backbuffer size, and not the menu size.  gl1_t already has
separate `screen_width`/`screen_height` for the actual window
dimensions and `menu_width`/`menu_height`/`menu_pitch`/`menu_bits`
for the menu surface.

The naming is misleading because gl2_t and gl3_t each have their own
`video_width`/`video_height` fields that hold the *backbuffer* size
— the same name for a different quantity.  The semantic mismatch
caused a bug during the audit fix for the screenshot readback
helper (commit d197d89): the gl1 site of that fix could not use
`gl1->video_width` like the gl2 / gl3 sites did, because in gl1
that field is the core frame's width, not the readable region of
the framebuffer.  d197d89 worked around the issue by calling
`video_driver_get_size()` instead.  Two existing comments in this
file (lines 850-855 and 985-993 prior to this commit) were defensive
notes warning future contributors not to misread these fields.

Rename the four `video_*` fields to `frame_*`:

  video_width  -> frame_width
  video_height -> frame_height
  video_pitch  -> frame_pitch
  video_bits   -> frame_bits

This:

  - matches the actual semantic (these are the libretro core
    *frame* properties);
  - parallels the existing `menu_width`/`menu_height`/`menu_pitch`/
    `menu_bits` fields, which name a sibling concept;
  - causes future cross-driver copy-paste from gl2 or gl3 to fail
    at compile time (`gl1->video_width` no longer exists) instead
    of silently producing a different result.

The two defensive comments are simplified — the field name now
says what it is, so the explanation no longer needs to warn the
reader off the wrong reading.

21 reference sites updated across the file, plus the four field
declarations and two comment rewrites.  No behavior change.  No
external callers: `gl1_t` is file-private (declared at the top of
gl1.c with no header counterpart), so the rename is contained to
this single file.

Verified that no stale `gl1->video_(width|height|pitch|bits)` or
`gl->video_(width|height|pitch|bits)` references remain by grep,
and that the renamed-field types still compile clean at -std=c89
-pedantic against a stub harness.
This commit is contained in:
U-DESKTOP-SPFP6AQ\twistedtechre committed 2026-05-01 04:12:11 +02:00
1 parent 7aa7c3b497
commit d6549402d3
1 file changed
+33 -37
Download Patch File Download Diff File Expand all files Collapse all files
gfx/drivers/gl1.c
+33 -37
View File
@@ -140,15 +140,15 @@ typedef struct gl1
int version_major;
int version_minor;
unsigned video_width;
unsigned video_height;
unsigned video_pitch;
unsigned frame_width;
unsigned frame_height;
unsigned frame_pitch;
unsigned screen_width;
unsigned screen_height;
unsigned menu_width;
unsigned menu_height;
unsigned menu_pitch;
unsigned video_bits;
unsigned frame_bits;
unsigned menu_bits;
unsigned out_vp_width;
unsigned out_vp_height;
@@ -847,16 +847,14 @@ static void gl1_raster_font_render_msg(
font->block->fullscreen = full_screen;
{
/* gl->video_width/height holds the core's emulated frame size
* (e.g. 256x224), not the window size — gl1 reuses that field
* for texture upload bookkeeping. The font viewport must cover
* the full window, so use screen_width/height instead. Fall
* back to video_width/height if the context driver did not
* report a screen size yet. */
/* The font viewport must cover the full window, so prefer
* screen_width/height (set by the context driver). Fall back
* to frame_width/height if the context driver hasn't reported
* a screen size yet. */
unsigned width = gl->screen_width
? gl->screen_width : gl->video_width;
? gl->screen_width : gl->frame_width;
unsigned height = gl->screen_height
? gl->screen_height : gl->video_height;
? gl->screen_height : gl->frame_height;
float inv_tex_size_x = 1.0f / font->tex_width;
float inv_tex_size_y = 1.0f / font->tex_height;
float inv_win_width;
@@ -987,12 +985,10 @@ static void gl1_render_overlay(gl1_t *gl,
{
int i;
/* gl1 reuses video_width/height for the emulated core frame size
* (e.g. 256x224 for SNES, 320x240 default for the menu surface),
* not the window size. Fullscreen overlays must be drawn into the
* actual window viewport, so use screen_width/height instead.
* Fall back to the passed-in width/height if the context driver
* has not reported a screen size yet. */
/* Fullscreen overlays must be drawn into the actual window
* viewport, so prefer screen_width/height (set by the context
* driver). Fall back to the passed-in width/height if the
* context driver hasn't reported a screen size yet. */
if (gl->screen_width)
width = gl->screen_width;
if (gl->screen_height)
@@ -1160,19 +1156,19 @@ static void *gl1_init(const video_info_t *video,
*input = NULL;
*input_data = NULL;
gl1->video_width = video->width;
gl1->video_height = video->height;
gl1->frame_width = video->width;
gl1->frame_height = video->height;
if (video->rgb32)
{
gl1->video_bits = 32;
gl1->video_pitch = video->width * 4;
gl1->frame_bits = 32;
gl1->frame_pitch = video->width * 4;
gl1->flags |= GL1_FLAG_RGB32;
}
else
{
gl1->video_bits = 16;
gl1->video_pitch = video->width * 2;
gl1->frame_bits = 16;
gl1->frame_pitch = video->width * 2;
}
ctx_driver = video_context_driver_init_first(gl1,
@@ -1623,7 +1619,7 @@ static bool gl1_frame(void *data, const void *frame,
bool draw = true;
bool do_swap = false;
gl1_t *gl1 = (gl1_t*)data;
unsigned bits = gl1->video_bits;
unsigned bits = gl1->frame_bits;
unsigned pot_width = 0;
unsigned pot_height = 0;
unsigned video_width = video_info->width;
@@ -1674,15 +1670,15 @@ static bool gl1_frame(void *data, const void *frame,
do_swap = frame || draw;
if ( (gl1->video_width != frame_width)
|| (gl1->video_height != frame_height)
|| (gl1->video_pitch != pitch))
if ( (gl1->frame_width != frame_width)
|| (gl1->frame_height != frame_height)
|| (gl1->frame_pitch != pitch))
{
if (frame_width > 4 && frame_height > 4)
{
gl1->video_width = frame_width;
gl1->video_height = frame_height;
gl1->video_pitch = pitch;
gl1->frame_width = frame_width;
gl1->frame_height = frame_height;
gl1->frame_pitch = pitch;
pot_width = GET_POT(frame_width);
pot_height = GET_POT(frame_height);
@@ -1697,9 +1693,9 @@ static bool gl1_frame(void *data, const void *frame,
}
}
width = gl1->video_width;
height = gl1->video_height;
pitch = gl1->video_pitch;
width = gl1->frame_width;
height = gl1->frame_height;
pitch = gl1->frame_pitch;
pot_width = GET_POT(width);
pot_height = GET_POT(height);
@@ -1721,10 +1717,10 @@ static bool gl1_frame(void *data, const void *frame,
frame_to_copy = gl1->video_buf;
}
if (gl1->video_width != width || gl1->video_height != height)
if (gl1->frame_width != width || gl1->frame_height != height)
{
gl1->video_width = width;
gl1->video_height = height;
gl1->frame_width = width;
gl1->frame_height = height;
}
if (gl1->ctx_driver->get_video_size)