Skip to content

Commit

Permalink
vdisp/drm: Rename Framebuffer to avoid symbol collision
Browse files Browse the repository at this point in the history
Avoid symbol collision with GL Framebuffer
  • Loading branch information
mpiatka committed Oct 17, 2024
1 parent a43128d commit 83cf5b2
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions src/video_display/drm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ struct Drm_state {
drmModeModeInfoPtr mode_info;
};

struct Framebuffer{
struct Drm_framebuffer{
uint32_t width = 0;
uint32_t height = 0;
uint32_t pitch = 0;
Expand Down Expand Up @@ -359,10 +359,10 @@ struct drm_display_state {

Drm_state drm;

Framebuffer splashscreen;
Drm_framebuffer splashscreen;

Framebuffer back_buffer;
Framebuffer front_buffer;
Drm_framebuffer back_buffer;
Drm_framebuffer front_buffer;

Drm_prime_fb drm_prime_fb;

Expand Down Expand Up @@ -700,8 +700,8 @@ static bool setup_crtc(drm_display_state *s){
return true;
}

static Framebuffer create_dumb_fb(int dri, int width, int height, uint32_t pix_fmt){
Framebuffer buf;
static Drm_framebuffer create_dumb_fb(int dri, int width, int height, uint32_t pix_fmt){
Drm_framebuffer buf;

//TODO: Currently pix_fmt is assumed to be single plane and 32 bpp

Expand Down Expand Up @@ -785,7 +785,7 @@ static void draw_splash(drm_display_state *s){
}
}

static void draw_frame(Framebuffer *dst, video_frame *src, bool center = true){
static void draw_frame(Drm_framebuffer *dst, video_frame *src, bool center = true){
auto dst_p = static_cast<char *>(dst->map.get());
auto src_p = static_cast<char *>(src->tiles[0].data);

Expand Down Expand Up @@ -822,7 +822,7 @@ static bool drm_format_supported(drm_display_state *s, uint32_t fmt){
return s->drm.supported_drm_formats.find(fmt) != s->drm.supported_drm_formats.end();
}

static Framebuffer get_splash_fb(drm_display_state *s, int width, int height){
static Drm_framebuffer get_splash_fb(drm_display_state *s, int width, int height){
frame_uniq splash_frame(get_splashscreen());

uint32_t pix_fmt;
Expand Down

0 comments on commit 83cf5b2

Please sign in to comment.