hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-25 22:25:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

render/gles2: Don't track has_alpha in pixel_format

Browse source 
Why track the alpha here when we can already get that information
elsewhere?
This commit is contained in:
Alexander Orzechowski 2023-06-23 17:24:38 -04:00 committed by Simon Ser
parent ae3d7a697c
commit 9118226634
3 changed files with 13 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/render/gles2.h
View file

@ -25,7 +25,6 @@ struct wlr_gles2_pixel_format {
// optional field, if empty then internalformat = format // optional field, if empty then internalformat = format
GLint gl_internalformat; GLint gl_internalformat;
GLint gl_format, gl_type; GLint gl_format, gl_type;
bool has_alpha;
}; };
struct wlr_gles2_tex_shader { struct wlr_gles2_tex_shader {

32
render/gles2/pixel_format.c
View file

@ -2,6 +2,7 @@
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#include <GLES2/gl2ext.h> #include <GLES2/gl2ext.h>
#include "render/gles2.h" #include "render/gles2.h"
#include "render/pixel_format.h"
/* /*
* The DRM formats are little endian while the GL formats are big endian, * The DRM formats are little endian while the GL formats are big endian,
@ -12,100 +13,84 @@ static const struct wlr_gles2_pixel_format formats[] = {
.drm_format = DRM_FORMAT_ARGB8888, .drm_format = DRM_FORMAT_ARGB8888,
.gl_format = GL_BGRA_EXT, .gl_format = GL_BGRA_EXT,
.gl_type = GL_UNSIGNED_BYTE, .gl_type = GL_UNSIGNED_BYTE,
.has_alpha = true,
}, },
{ {
.drm_format = DRM_FORMAT_XRGB8888, .drm_format = DRM_FORMAT_XRGB8888,
.gl_format = GL_BGRA_EXT, .gl_format = GL_BGRA_EXT,
.gl_type = GL_UNSIGNED_BYTE, .gl_type = GL_UNSIGNED_BYTE,
.has_alpha = false,
}, },
{ {
.drm_format = DRM_FORMAT_XBGR8888, .drm_format = DRM_FORMAT_XBGR8888,
.gl_format = GL_RGBA, .gl_format = GL_RGBA,
.gl_type = GL_UNSIGNED_BYTE, .gl_type = GL_UNSIGNED_BYTE,
.has_alpha = false,
}, },
{ {
.drm_format = DRM_FORMAT_ABGR8888, .drm_format = DRM_FORMAT_ABGR8888,
.gl_format = GL_RGBA, .gl_format = GL_RGBA,
.gl_type = GL_UNSIGNED_BYTE, .gl_type = GL_UNSIGNED_BYTE,
.has_alpha = true,
}, },
{ {
.drm_format = DRM_FORMAT_BGR888, .drm_format = DRM_FORMAT_BGR888,
.gl_format = GL_RGB, .gl_format = GL_RGB,
.gl_type = GL_UNSIGNED_BYTE, .gl_type = GL_UNSIGNED_BYTE,
.has_alpha = false,
}, },
#if WLR_LITTLE_ENDIAN #if WLR_LITTLE_ENDIAN
{ {
.drm_format = DRM_FORMAT_RGBX4444, .drm_format = DRM_FORMAT_RGBX4444,
.gl_format = GL_RGBA, .gl_format = GL_RGBA,
.gl_type = GL_UNSIGNED_SHORT_4_4_4_4, .gl_type = GL_UNSIGNED_SHORT_4_4_4_4,
.has_alpha = false,
}, },
{ {
.drm_format = DRM_FORMAT_RGBA4444, .drm_format = DRM_FORMAT_RGBA4444,
.gl_format = GL_RGBA, .gl_format = GL_RGBA,
.gl_type = GL_UNSIGNED_SHORT_4_4_4_4, .gl_type = GL_UNSIGNED_SHORT_4_4_4_4,
.has_alpha = true,
}, },
{ {
.drm_format = DRM_FORMAT_RGBX5551, .drm_format = DRM_FORMAT_RGBX5551,
.gl_format = GL_RGBA, .gl_format = GL_RGBA,
.gl_type = GL_UNSIGNED_SHORT_5_5_5_1, .gl_type = GL_UNSIGNED_SHORT_5_5_5_1,
.has_alpha = false,
}, },
{ {
.drm_format = DRM_FORMAT_RGBA5551, .drm_format = DRM_FORMAT_RGBA5551,
.gl_format = GL_RGBA, .gl_format = GL_RGBA,
.gl_type = GL_UNSIGNED_SHORT_5_5_5_1, .gl_type = GL_UNSIGNED_SHORT_5_5_5_1,
.has_alpha = true,
}, },
{ {
.drm_format = DRM_FORMAT_RGB565, .drm_format = DRM_FORMAT_RGB565,
.gl_format = GL_RGB, .gl_format = GL_RGB,
.gl_type = GL_UNSIGNED_SHORT_5_6_5, .gl_type = GL_UNSIGNED_SHORT_5_6_5,
.has_alpha = false,
}, },
{ {
.drm_format = DRM_FORMAT_XBGR2101010, .drm_format = DRM_FORMAT_XBGR2101010,
.gl_format = GL_RGBA, .gl_format = GL_RGBA,
.gl_type = GL_UNSIGNED_INT_2_10_10_10_REV_EXT, .gl_type = GL_UNSIGNED_INT_2_10_10_10_REV_EXT,
.has_alpha = false,
}, },
{ {
.drm_format = DRM_FORMAT_ABGR2101010, .drm_format = DRM_FORMAT_ABGR2101010,
.gl_format = GL_RGBA, .gl_format = GL_RGBA,
.gl_type = GL_UNSIGNED_INT_2_10_10_10_REV_EXT, .gl_type = GL_UNSIGNED_INT_2_10_10_10_REV_EXT,
.has_alpha = true,
}, },
{ {
.drm_format = DRM_FORMAT_XBGR16161616F, .drm_format = DRM_FORMAT_XBGR16161616F,
.gl_format = GL_RGBA, .gl_format = GL_RGBA,
.gl_type = GL_HALF_FLOAT_OES, .gl_type = GL_HALF_FLOAT_OES,
.has_alpha = false,
}, },
{ {
.drm_format = DRM_FORMAT_ABGR16161616F, .drm_format = DRM_FORMAT_ABGR16161616F,
.gl_format = GL_RGBA, .gl_format = GL_RGBA,
.gl_type = GL_HALF_FLOAT_OES, .gl_type = GL_HALF_FLOAT_OES,
.has_alpha = true,
}, },
{ {
.drm_format = DRM_FORMAT_XBGR16161616, .drm_format = DRM_FORMAT_XBGR16161616,
.gl_internalformat = GL_RGBA16_EXT, .gl_internalformat = GL_RGBA16_EXT,
.gl_format = GL_RGBA, .gl_format = GL_RGBA,
.gl_type = GL_UNSIGNED_SHORT, .gl_type = GL_UNSIGNED_SHORT,
.has_alpha = false,
}, },
{ {
.drm_format = DRM_FORMAT_ABGR16161616, .drm_format = DRM_FORMAT_ABGR16161616,
.gl_internalformat = GL_RGBA16_EXT, .gl_internalformat = GL_RGBA16_EXT,
.gl_format = GL_RGBA, .gl_format = GL_RGBA,
.gl_type = GL_UNSIGNED_SHORT, .gl_type = GL_UNSIGNED_SHORT,
.has_alpha = true,
}, },
#endif #endif
}; };
@ -151,11 +136,18 @@ const struct wlr_gles2_pixel_format *get_gles2_format_from_drm(uint32_t fmt) {
const struct wlr_gles2_pixel_format *get_gles2_format_from_gl( const struct wlr_gles2_pixel_format *get_gles2_format_from_gl(
GLint gl_format, GLint gl_type, bool alpha) { GLint gl_format, GLint gl_type, bool alpha) {
for (size_t i = 0; i < sizeof(formats) / sizeof(*formats); ++i) { for (size_t i = 0; i < sizeof(formats) / sizeof(*formats); ++i) {
if (formats[i].gl_format == gl_format && if (formats[i].gl_format != gl_format ||
formats[i].gl_type == gl_type && formats[i].gl_type != gl_type) {
formats[i].has_alpha == alpha) { continue;
return &formats[i];
} }
const struct wlr_pixel_format_info *drm_fmt =
drm_get_pixel_format_info(formats[i].drm_format);
if (drm_fmt->has_alpha != alpha) {
continue;
}
return &formats[i];
} }
return NULL; return NULL;
} }

2
render/gles2/texture.c
View file

@ -216,7 +216,7 @@ static struct wlr_texture *gles2_texture_from_pixels(
return NULL; return NULL;
} }
texture->target = GL_TEXTURE_2D; texture->target = GL_TEXTURE_2D;
texture->has_alpha = fmt->has_alpha; texture->has_alpha = drm_fmt->has_alpha;
texture->drm_format = fmt->drm_format; texture->drm_format = fmt->drm_format;
GLint internal_format = fmt->gl_internalformat; GLint internal_format = fmt->gl_internalformat;