summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Englund <tomenglund26@gmail.com>2026-01-07 19:53:42 +0100
committerGitHub <noreply@github.com>2026-01-07 19:53:42 +0100
commit918e2bb9be0e1d233f9394f1d569137788c43c01 (patch)
treea1623c8cd20c7ad625f65adb05cfe82a9e06ee8c /src
parenta383ca1866b04d175bc2cf208859147d22a6968e (diff)
renderer/gl: add internal gl formats and reduce internal driver format conversions (#12879)
* format: add internal formats for drm formats cross referenced with weston and added internal formats and types for a lot of missing ones. also added a isFormatYUV helper. * framebuffer: ensure we use right internalformat ensure we use the right internal format to avoid internal driver blitting, also since we only attach the GL_STENCIL_ATTACHMENT we might just aswell only use the GL_STENCIL_INDEX8 to not confuse drivers that we want a depth aswell. * texture: use external on yuv or non linear mods using external makes us use the gpu's internal detiler. and this is makes intel a lot happier then having to format convert it to a linear format internally. * shaders: add external support to CM frag add external support to CM frag, and correct ext.frag typo. * formats: remove duplicates and fix a typo in cm.frag remove duplicate formats and a typo in cm.frag * formats: add swizzle logic to all formats add swizzle logic from weston for all formats and use it in shm texture paths. * format: more format changes use monitor drm format instead of forcing something different. * shader: remove external from cm.frag drivers want this resolved at compiletime cant use both samplerExternalOES and sampler2d and then runtime branch it. * screencopy: swizzle textures in screencopy swizzle textures in screencopy, to get the right colors when copying. * screencopy: restore old behaviour try restore old behaviour before the gles3 format changes. glReadPixels had the wrong format, so i went to far trying to mitigate it. should be like before now.
Diffstat (limited to 'src')
-rw-r--r--src/helpers/Format.cpp312
-rw-r--r--src/helpers/Format.hpp40
-rw-r--r--src/protocols/Screencopy.cpp27
-rw-r--r--src/protocols/ToplevelExport.cpp22
-rw-r--r--src/render/Framebuffer.cpp16
-rw-r--r--src/render/Framebuffer.hpp3
-rw-r--r--src/render/Texture.cpp31
-rw-r--r--src/render/Texture.hpp1
-rw-r--r--src/render/shaders/glsl/CM.frag6
-rw-r--r--src/render/shaders/glsl/ext.frag4
10 files changed, 291 insertions, 171 deletions
diff --git a/src/helpers/Format.cpp b/src/helpers/Format.cpp
index 37f77d78..0054c25a 100644
--- a/src/helpers/Format.cpp
+++ b/src/helpers/Format.cpp
@@ -6,158 +6,186 @@
#include <xf86drm.h>
#include <drm_fourcc.h>
-/*
- DRM formats are LE, while OGL is BE. The two primary formats
- will be flipped, so we will set flipRB which will later use swizzle
- to flip the red and blue channels.
- This will not work on GLES2, but I want to drop support for it one day anyways.
-*/
inline const std::vector<SPixelFormat> GLES3_FORMATS = {
{
- .drmFormat = DRM_FORMAT_ARGB8888,
- .flipRB = true,
- .glFormat = GL_RGBA,
- .glType = GL_UNSIGNED_BYTE,
- .withAlpha = true,
- .alphaStripped = DRM_FORMAT_XRGB8888,
- .bytesPerBlock = 4,
+ .drmFormat = DRM_FORMAT_ARGB8888,
+ .glInternalFormat = GL_RGBA8,
+ .glFormat = GL_RGBA,
+ .glType = GL_UNSIGNED_BYTE,
+ .withAlpha = true,
+ .alphaStripped = DRM_FORMAT_XRGB8888,
+ .bytesPerBlock = 4,
+ .swizzle = {SWIZZLE_BGRA},
},
{
- .drmFormat = DRM_FORMAT_XRGB8888,
- .flipRB = true,
- .glFormat = GL_RGBA,
- .glType = GL_UNSIGNED_BYTE,
- .withAlpha = false,
- .alphaStripped = DRM_FORMAT_XRGB8888,
- .bytesPerBlock = 4,
+ .drmFormat = DRM_FORMAT_XRGB8888,
+ .glInternalFormat = GL_RGBA8,
+ .glFormat = GL_RGBA,
+ .glType = GL_UNSIGNED_BYTE,
+ .withAlpha = false,
+ .alphaStripped = DRM_FORMAT_XRGB8888,
+ .bytesPerBlock = 4,
+ .swizzle = {SWIZZLE_BGR1},
},
{
- .drmFormat = DRM_FORMAT_XBGR8888,
- .glFormat = GL_RGBA,
- .glType = GL_UNSIGNED_BYTE,
- .withAlpha = false,
- .alphaStripped = DRM_FORMAT_XBGR8888,
- .bytesPerBlock = 4,
+ .drmFormat = DRM_FORMAT_XBGR8888,
+ .glInternalFormat = GL_RGBA8,
+ .glFormat = GL_RGBA,
+ .glType = GL_UNSIGNED_BYTE,
+ .withAlpha = false,
+ .alphaStripped = DRM_FORMAT_XBGR8888,
+ .bytesPerBlock = 4,
+ .swizzle = {SWIZZLE_RGB1},
},
{
- .drmFormat = DRM_FORMAT_ABGR8888,
- .glFormat = GL_RGBA,
- .glType = GL_UNSIGNED_BYTE,
- .withAlpha = true,
- .alphaStripped = DRM_FORMAT_XBGR8888,
- .bytesPerBlock = 4,
+ .drmFormat = DRM_FORMAT_ABGR8888,
+ .glInternalFormat = GL_RGBA8,
+ .glFormat = GL_RGBA,
+ .glType = GL_UNSIGNED_BYTE,
+ .withAlpha = true,
+ .alphaStripped = DRM_FORMAT_XBGR8888,
+ .bytesPerBlock = 4,
+ .swizzle = {SWIZZLE_RGBA},
},
{
- .drmFormat = DRM_FORMAT_BGR888,
- .glFormat = GL_RGB,
- .glType = GL_UNSIGNED_BYTE,
- .withAlpha = false,
- .alphaStripped = DRM_FORMAT_BGR888,
- .bytesPerBlock = 3,
+ .drmFormat = DRM_FORMAT_BGR888,
+ .glInternalFormat = GL_RGB8,
+ .glFormat = GL_RGB,
+ .glType = GL_UNSIGNED_BYTE,
+ .withAlpha = false,
+ .alphaStripped = DRM_FORMAT_BGR888,
+ .bytesPerBlock = 3,
+ .swizzle = {SWIZZLE_RGB1},
},
{
- .drmFormat = DRM_FORMAT_RGBX4444,
- .glFormat = GL_RGBA,
- .glType = GL_UNSIGNED_SHORT_4_4_4_4,
- .withAlpha = false,
- .alphaStripped = DRM_FORMAT_RGBX4444,
- .bytesPerBlock = 2,
+ .drmFormat = DRM_FORMAT_RGBX4444,
+ .glInternalFormat = GL_RGBA4,
+ .glFormat = GL_RGBA,
+ .glType = GL_UNSIGNED_SHORT_4_4_4_4,
+ .withAlpha = false,
+ .alphaStripped = DRM_FORMAT_RGBX4444,
+ .bytesPerBlock = 2,
+ .swizzle = {SWIZZLE_RGB1},
},
{
- .drmFormat = DRM_FORMAT_RGBA4444,
- .glFormat = GL_RGBA,
- .glType = GL_UNSIGNED_SHORT_4_4_4_4,
- .withAlpha = true,
- .alphaStripped = DRM_FORMAT_RGBX4444,
- .bytesPerBlock = 2,
+ .drmFormat = DRM_FORMAT_RGBA4444,
+ .glInternalFormat = GL_RGBA4,
+ .glFormat = GL_RGBA,
+ .glType = GL_UNSIGNED_SHORT_4_4_4_4,
+ .withAlpha = true,
+ .alphaStripped = DRM_FORMAT_RGBX4444,
+ .bytesPerBlock = 2,
+ .swizzle = {SWIZZLE_RGBA},
},
{
- .drmFormat = DRM_FORMAT_RGBX5551,
- .glFormat = GL_RGBA,
- .glType = GL_UNSIGNED_SHORT_5_5_5_1,
- .withAlpha = false,
- .alphaStripped = DRM_FORMAT_RGBX5551,
- .bytesPerBlock = 2,
+ .drmFormat = DRM_FORMAT_RGBX5551,
+ .glInternalFormat = GL_RGB5_A1,
+ .glFormat = GL_RGBA,
+ .glType = GL_UNSIGNED_SHORT_5_5_5_1,
+ .withAlpha = false,
+ .alphaStripped = DRM_FORMAT_RGBX5551,
+ .bytesPerBlock = 2,
+ .swizzle = {SWIZZLE_RGB1},
},
{
- .drmFormat = DRM_FORMAT_RGBA5551,
- .glFormat = GL_RGBA,
- .glType = GL_UNSIGNED_SHORT_5_5_5_1,
- .withAlpha = true,
- .alphaStripped = DRM_FORMAT_RGBX5551,
- .bytesPerBlock = 2,
+ .drmFormat = DRM_FORMAT_RGBA5551,
+ .glInternalFormat = GL_RGB5_A1,
+ .glFormat = GL_RGBA,
+ .glType = GL_UNSIGNED_SHORT_5_5_5_1,
+ .withAlpha = true,
+ .alphaStripped = DRM_FORMAT_RGBX5551,
+ .bytesPerBlock = 2,
+ .swizzle = {SWIZZLE_RGBA},
},
{
- .drmFormat = DRM_FORMAT_RGB565,
- .glFormat = GL_RGB,
- .glType = GL_UNSIGNED_SHORT_5_6_5,
- .withAlpha = false,
- .alphaStripped = DRM_FORMAT_RGB565,
- .bytesPerBlock = 2,
+ .drmFormat = DRM_FORMAT_RGB565,
+ .glInternalFormat = GL_RGB565,
+ .glFormat = GL_RGB,
+ .glType = GL_UNSIGNED_SHORT_5_6_5,
+ .withAlpha = false,
+ .alphaStripped = DRM_FORMAT_RGB565,
+ .bytesPerBlock = 2,
+ .swizzle = {SWIZZLE_RGB1},
},
{
- .drmFormat = DRM_FORMAT_XBGR2101010,
- .glFormat = GL_RGBA,
- .glType = GL_UNSIGNED_INT_2_10_10_10_REV,
- .withAlpha = false,
- .alphaStripped = DRM_FORMAT_XBGR2101010,
- .bytesPerBlock = 4,
+ .drmFormat = DRM_FORMAT_XBGR2101010,
+ .glInternalFormat = GL_RGB10_A2,
+ .glFormat = GL_RGBA,
+ .glType = GL_UNSIGNED_INT_2_10_10_10_REV,
+ .withAlpha = false,
+ .alphaStripped = DRM_FORMAT_XBGR2101010,
+ .bytesPerBlock = 4,
+ .swizzle = {SWIZZLE_RGB1},
},
{
- .drmFormat = DRM_FORMAT_ABGR2101010,
- .glFormat = GL_RGBA,
- .glType = GL_UNSIGNED_INT_2_10_10_10_REV,
- .withAlpha = true,
- .alphaStripped = DRM_FORMAT_XBGR2101010,
- .bytesPerBlock = 4,
+ .drmFormat = DRM_FORMAT_ABGR2101010,
+ .glInternalFormat = GL_RGB10_A2,
+ .glFormat = GL_RGBA,
+ .glType = GL_UNSIGNED_INT_2_10_10_10_REV,
+ .withAlpha = true,
+ .alphaStripped = DRM_FORMAT_XBGR2101010,
+ .bytesPerBlock = 4,
+ .swizzle = {SWIZZLE_RGBA},
},
{
- .drmFormat = DRM_FORMAT_XRGB2101010,
- .glFormat = GL_RGBA,
- .glType = GL_UNSIGNED_INT_2_10_10_10_REV,
- .withAlpha = false,
- .alphaStripped = DRM_FORMAT_XRGB2101010,
- .bytesPerBlock = 4,
+ .drmFormat = DRM_FORMAT_XRGB2101010,
+ .glInternalFormat = GL_RGB10_A2,
+ .glFormat = GL_RGBA,
+ .glType = GL_UNSIGNED_INT_2_10_10_10_REV,
+ .withAlpha = false,
+ .alphaStripped = DRM_FORMAT_XRGB2101010,
+ .bytesPerBlock = 4,
+ .swizzle = {SWIZZLE_BGR1},
},
{
- .drmFormat = DRM_FORMAT_ARGB2101010,
- .glFormat = GL_RGBA,
- .glType = GL_UNSIGNED_INT_2_10_10_10_REV,
- .withAlpha = true,
- .alphaStripped = DRM_FORMAT_XRGB2101010,
- .bytesPerBlock = 4,
+ .drmFormat = DRM_FORMAT_ARGB2101010,
+ .glInternalFormat = GL_RGB10_A2,
+ .glFormat = GL_RGBA,
+ .glType = GL_UNSIGNED_INT_2_10_10_10_REV,
+ .withAlpha = true,
+ .alphaStripped = DRM_FORMAT_XRGB2101010,
+ .bytesPerBlock = 4,
+ .swizzle = {SWIZZLE_BGRA},
},
{
- .drmFormat = DRM_FORMAT_XBGR16161616F,
- .glFormat = GL_RGBA,
- .glType = GL_HALF_FLOAT,
- .withAlpha = false,
- .alphaStripped = DRM_FORMAT_XBGR16161616F,
- .bytesPerBlock = 8,
+ .drmFormat = DRM_FORMAT_XBGR16161616F,
+ .glInternalFormat = GL_RGBA16F,
+ .glFormat = GL_RGBA,
+ .glType = GL_HALF_FLOAT,
+ .withAlpha = false,
+ .alphaStripped = DRM_FORMAT_XBGR16161616F,
+ .bytesPerBlock = 8,
+ .swizzle = {SWIZZLE_RGB1},
},
{
- .drmFormat = DRM_FORMAT_ABGR16161616F,
- .glFormat = GL_RGBA,
- .glType = GL_HALF_FLOAT,
- .withAlpha = true,
- .alphaStripped = DRM_FORMAT_XBGR16161616F,
- .bytesPerBlock = 8,
+ .drmFormat = DRM_FORMAT_ABGR16161616F,
+ .glInternalFormat = GL_RGBA16F,
+ .glFormat = GL_RGBA,
+ .glType = GL_HALF_FLOAT,
+ .withAlpha = true,
+ .alphaStripped = DRM_FORMAT_XBGR16161616F,
+ .bytesPerBlock = 8,
+ .swizzle = {SWIZZLE_RGBA},
},
{
- .drmFormat = DRM_FORMAT_XBGR16161616,
- .glFormat = GL_RGBA16UI,
- .glType = GL_UNSIGNED_SHORT,
- .withAlpha = false,
- .alphaStripped = DRM_FORMAT_XBGR16161616,
- .bytesPerBlock = 8,
+ .drmFormat = DRM_FORMAT_XBGR16161616,
+ .glInternalFormat = GL_RGBA16UI,
+ .glFormat = GL_RGBA_INTEGER,
+ .glType = GL_UNSIGNED_SHORT,
+ .withAlpha = false,
+ .alphaStripped = DRM_FORMAT_XBGR16161616,
+ .bytesPerBlock = 8,
+ .swizzle = {SWIZZLE_RGBA},
},
{
- .drmFormat = DRM_FORMAT_ABGR16161616,
- .glFormat = GL_RGBA16UI,
- .glType = GL_UNSIGNED_SHORT,
- .withAlpha = true,
- .alphaStripped = DRM_FORMAT_XBGR16161616,
- .bytesPerBlock = 8,
+ .drmFormat = DRM_FORMAT_ABGR16161616,
+ .glInternalFormat = GL_RGBA16UI,
+ .glFormat = GL_RGBA_INTEGER,
+ .glType = GL_UNSIGNED_SHORT,
+ .withAlpha = true,
+ .alphaStripped = DRM_FORMAT_XBGR16161616,
+ .bytesPerBlock = 8,
+ .swizzle = {SWIZZLE_RGBA},
},
{
.drmFormat = DRM_FORMAT_YVYU,
@@ -170,24 +198,28 @@ inline const std::vector<SPixelFormat> GLES3_FORMATS = {
.blockSize = {2, 1},
},
{
- .drmFormat = DRM_FORMAT_R8,
- .bytesPerBlock = 1,
+ .drmFormat = DRM_FORMAT_R8,
+ .glInternalFormat = GL_R8,
+ .glFormat = GL_RED,
+ .glType = GL_UNSIGNED_BYTE,
+ .bytesPerBlock = 1,
+ .swizzle = {SWIZZLE_R001},
},
{
- .drmFormat = DRM_FORMAT_GR88,
- .bytesPerBlock = 2,
+ .drmFormat = DRM_FORMAT_GR88,
+ .glInternalFormat = GL_RG8,
+ .glFormat = GL_RG,
+ .glType = GL_UNSIGNED_BYTE,
+ .bytesPerBlock = 2,
+ .swizzle = {SWIZZLE_RG01},
},
{
- .drmFormat = DRM_FORMAT_RGB888,
- .bytesPerBlock = 3,
- },
- {
- .drmFormat = DRM_FORMAT_BGR888,
- .bytesPerBlock = 3,
- },
- {
- .drmFormat = DRM_FORMAT_RGBX4444,
- .bytesPerBlock = 2,
+ .drmFormat = DRM_FORMAT_RGB888,
+ .glInternalFormat = GL_RGB8,
+ .glFormat = GL_RGB,
+ .glType = GL_UNSIGNED_BYTE,
+ .bytesPerBlock = 3,
+ .swizzle = {SWIZZLE_BGR1},
},
};
@@ -229,6 +261,26 @@ const SPixelFormat* NFormatUtils::getPixelFormatFromGL(uint32_t glFormat, uint32
return nullptr;
}
+bool NFormatUtils::isFormatYUV(uint32_t drmFormat) {
+ switch (drmFormat) {
+ case DRM_FORMAT_YUYV:
+ case DRM_FORMAT_YVYU:
+ case DRM_FORMAT_UYVY:
+ case DRM_FORMAT_VYUY:
+ case DRM_FORMAT_AYUV:
+ case DRM_FORMAT_NV12:
+ case DRM_FORMAT_NV21:
+ case DRM_FORMAT_NV16:
+ case DRM_FORMAT_NV61:
+ case DRM_FORMAT_YUV410:
+ case DRM_FORMAT_YUV411:
+ case DRM_FORMAT_YUV420:
+ case DRM_FORMAT_YUV422:
+ case DRM_FORMAT_YUV444: return true;
+ default: return false;
+ }
+}
+
bool NFormatUtils::isFormatOpaque(DRMFormat drm) {
const auto FMT = NFormatUtils::getPixelFormatFromDRM(drm);
if (!FMT)
diff --git a/src/helpers/Format.hpp b/src/helpers/Format.hpp
index fe68f763..917fe3cb 100644
--- a/src/helpers/Format.hpp
+++ b/src/helpers/Format.hpp
@@ -2,22 +2,43 @@
#include <cstdint>
#include <string>
+#include <GLES3/gl32.h>
#include "math/Math.hpp"
#include <aquamarine/backend/Misc.hpp>
using DRMFormat = uint32_t;
using SHMFormat = uint32_t;
+#define SWIZZLE_A1GB {GL_ALPHA, GL_ONE, GL_GREEN, GL_BLUE}
+#define SWIZZLE_ABG1 {GL_ALPHA, GL_BLUE, GL_GREEN, GL_ONE}
+#define SWIZZLE_ABGR {GL_ALPHA, GL_BLUE, GL_GREEN, GL_RED}
+#define SWIZZLE_ARGB {GL_ALPHA, GL_RED, GL_GREEN, GL_BLUE}
+#define SWIZZLE_B1RG {GL_BLUE, GL_ONE, GL_RED, GL_GREEN}
+#define SWIZZLE_BARG {GL_BLUE, GL_ALPHA, GL_RED, GL_GREEN}
+#define SWIZZLE_BGR1 {GL_BLUE, GL_GREEN, GL_RED, GL_ONE}
+#define SWIZZLE_BGRA {GL_BLUE, GL_GREEN, GL_RED, GL_ALPHA}
+#define SWIZZLE_G1AB {GL_GREEN, GL_ONE, GL_ALPHA, GL_BLUE}
+#define SWIZZLE_GBA1 {GL_GREEN, GL_BLUE, GL_ALPHA, GL_ONE}
+#define SWIZZLE_GBAR {GL_GREEN, GL_BLUE, GL_ALPHA, GL_RED}
+#define SWIZZLE_GRAB {GL_GREEN, GL_RED, GL_ALPHA, GL_BLUE}
+#define SWIZZLE_R001 {GL_RED, GL_ZERO, GL_ZERO, GL_ONE}
+#define SWIZZLE_R1BG {GL_RED, GL_ONE, GL_BLUE, GL_GREEN}
+#define SWIZZLE_RABG {GL_RED, GL_ALPHA, GL_BLUE, GL_GREEN}
+#define SWIZZLE_RG01 {GL_RED, GL_GREEN, GL_ZERO, GL_ONE}
+#define SWIZZLE_GR01 {GL_GREEN, GL_RED, GL_ZERO, GL_ONE}
+#define SWIZZLE_RGB1 {GL_RED, GL_GREEN, GL_BLUE, GL_ONE}
+#define SWIZZLE_RGBA {GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA}
+
struct SPixelFormat {
- DRMFormat drmFormat = 0; /* DRM_FORMAT_INVALID */
- bool flipRB = false;
- int glInternalFormat = 0;
- int glFormat = 0;
- int glType = 0;
- bool withAlpha = true;
- DRMFormat alphaStripped = 0; /* DRM_FORMAT_INVALID */
- uint32_t bytesPerBlock = 0;
- Vector2D blockSize;
+ DRMFormat drmFormat = 0; /* DRM_FORMAT_INVALID */
+ int glInternalFormat = 0;
+ int glFormat = 0;
+ int glType = 0;
+ bool withAlpha = true;
+ DRMFormat alphaStripped = 0; /* DRM_FORMAT_INVALID */
+ uint32_t bytesPerBlock = 0;
+ Vector2D blockSize;
+ std::optional<std::array<GLint, 4>> swizzle = std::nullopt;
};
using SDRMFormat = Aquamarine::SDRMFormat;
@@ -28,6 +49,7 @@ namespace NFormatUtils {
const SPixelFormat* getPixelFormatFromDRM(DRMFormat drm);
const SPixelFormat* getPixelFormatFromGL(uint32_t glFormat, uint32_t glType, bool alpha);
+ bool isFormatYUV(uint32_t drmFormat);
bool isFormatOpaque(DRMFormat drm);
int pixelsPerBlock(const SPixelFormat* const fmt);
int minStride(const SPixelFormat* const fmt, int32_t width);
diff --git a/src/protocols/Screencopy.cpp b/src/protocols/Screencopy.cpp
index c02b759c..d66c5342 100644
--- a/src/protocols/Screencopy.cpp
+++ b/src/protocols/Screencopy.cpp
@@ -192,8 +192,7 @@ void CScreencopyFrame::share() {
}
void CScreencopyFrame::renderMon() {
- auto TEXTURE = makeShared<CTexture>(m_monitor->m_output->state->state().buffer);
-
+ auto TEXTURE = makeShared<CTexture>(m_monitor->m_output->state->state().buffer);
CRegion fakeDamage = {0, 0, INT16_MAX, INT16_MAX};
const bool IS_CM_AWARE = PROTO::colorManagement && PROTO::colorManagement->isClientCMAware(m_client->client());
@@ -385,8 +384,6 @@ bool CScreencopyFrame::copyShm() {
return false;
}
- auto glFormat = PFORMAT->flipRB ? GL_BGRA_EXT : GL_RGBA;
-
g_pHyprOpenGL->m_renderData.blockScreenShader = true;
g_pHyprRenderer->endRender();
@@ -396,8 +393,26 @@ bool CScreencopyFrame::copyShm() {
glPixelStorei(GL_PACK_ALIGNMENT, 1);
- const auto drmFmt = NFormatUtils::getPixelFormatFromDRM(shm.format);
- uint32_t packStride = NFormatUtils::minStride(drmFmt, m_box.w);
+ uint32_t packStride = NFormatUtils::minStride(PFORMAT, m_box.w);
+ int glFormat = PFORMAT->glFormat;
+
+ if (glFormat == GL_RGBA)
+ glFormat = GL_BGRA_EXT;
+
+ if (glFormat != GL_BGRA_EXT && glFormat != GL_RGB) {
+ if (PFORMAT->swizzle.has_value()) {
+ std::array<GLint, 4> RGBA = SWIZZLE_RGBA;
+ std::array<GLint, 4> BGRA = SWIZZLE_BGRA;
+ if (PFORMAT->swizzle == RGBA)
+ glFormat = GL_RGBA;
+ else if (PFORMAT->swizzle == BGRA)
+ glFormat = GL_BGRA_EXT;
+ else {
+ LOGM(Log::ERR, "Copied frame via shm might be broken or color flipped");
+ glFormat = GL_RGBA;
+ }
+ }
+ }
// This could be optimized by using a pixel buffer object to make this async,
// but really clients should just use a dma buffer anyways.
diff --git a/src/protocols/ToplevelExport.cpp b/src/protocols/ToplevelExport.cpp
index 9a97f934..7549425c 100644
--- a/src/protocols/ToplevelExport.cpp
+++ b/src/protocols/ToplevelExport.cpp
@@ -285,8 +285,6 @@ bool CToplevelExportFrame::copyShm(const Time::steady_tp& now) {
glBindFramebuffer(GL_READ_FRAMEBUFFER, outFB.getFBID());
glPixelStorei(GL_PACK_ALIGNMENT, 1);
- auto glFormat = PFORMAT->flipRB ? GL_BGRA_EXT : GL_RGBA;
-
auto origin = Vector2D(0, 0);
switch (PMONITOR->m_transform) {
case WL_OUTPUT_TRANSFORM_FLIPPED_180:
@@ -308,6 +306,26 @@ bool CToplevelExportFrame::copyShm(const Time::steady_tp& now) {
default: break;
}
+ int glFormat = PFORMAT->glFormat;
+
+ if (glFormat == GL_RGBA)
+ glFormat = GL_BGRA_EXT;
+
+ if (glFormat != GL_BGRA_EXT && glFormat != GL_RGB) {
+ if (PFORMAT->swizzle.has_value()) {
+ std::array<GLint, 4> RGBA = SWIZZLE_RGBA;
+ std::array<GLint, 4> BGRA = SWIZZLE_BGRA;
+ if (PFORMAT->swizzle == RGBA)
+ glFormat = GL_RGBA;
+ else if (PFORMAT->swizzle == BGRA)
+ glFormat = GL_BGRA_EXT;
+ else {
+ LOGM(Log::ERR, "Copied frame via shm might be broken or color flipped");
+ glFormat = GL_RGBA;
+ }
+ }
+ }
+
glReadPixels(origin.x, origin.y, m_box.width, m_box.height, glFormat, PFORMAT->glType, pixelData);
if (overlayCursor) {
diff --git a/src/render/Framebuffer.cpp b/src/render/Framebuffer.cpp
index 48e44570..cfafd4be 100644
--- a/src/render/Framebuffer.cpp
+++ b/src/render/Framebuffer.cpp
@@ -9,10 +9,8 @@ bool CFramebuffer::alloc(int w, int h, uint32_t drmFormat) {
bool firstAlloc = false;
RASSERT((w > 0 && h > 0), "cannot alloc a FB with negative / zero size! (attempted {}x{})", w, h);
- const uint32_t glFormat = NFormatUtils::drmFormatToGL(drmFormat);
- const uint32_t glType = NFormatUtils::glFormatToType(glFormat);
- const bool sizeChanged = (m_size != Vector2D(w, h));
- const bool formatChanged = (drmFormat != m_drmFormat);
+ const bool sizeChanged = (m_size != Vector2D(w, h));
+ const bool formatChanged = (drmFormat != m_drmFormat);
if (!m_tex) {
m_tex = makeShared<CTexture>();
@@ -32,14 +30,15 @@ bool CFramebuffer::alloc(int w, int h, uint32_t drmFormat) {
}
if (firstAlloc || sizeChanged || formatChanged) {
+ const auto format = NFormatUtils::getPixelFormatFromDRM(drmFormat);
m_tex->bind();
- glTexImage2D(GL_TEXTURE_2D, 0, glFormat, w, h, 0, GL_RGBA, glType, nullptr);
+ glTexImage2D(GL_TEXTURE_2D, 0, format->glInternalFormat ? format->glInternalFormat : format->glFormat, w, h, 0, format->glFormat, format->glType, nullptr);
glBindFramebuffer(GL_FRAMEBUFFER, m_fb);
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, m_tex->m_texID, 0);
if (m_stencilTex) {
m_stencilTex->bind();
- glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH24_STENCIL8, w, h, 0, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, nullptr);
+ glTexImage2D(GL_TEXTURE_2D, 0, GL_STENCIL_INDEX8, w, h, 0, GL_STENCIL_INDEX, GL_UNSIGNED_BYTE, nullptr);
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_TEXTURE_2D, m_stencilTex->m_texID, 0);
}
@@ -59,9 +58,12 @@ bool CFramebuffer::alloc(int w, int h, uint32_t drmFormat) {
}
void CFramebuffer::addStencil(SP<CTexture> tex) {
+ if (m_stencilTex == tex)
+ return;
+
m_stencilTex = tex;
m_stencilTex->bind();
- glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH24_STENCIL8, m_size.x, m_size.y, 0, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, nullptr);
+ glTexImage2D(GL_TEXTURE_2D, 0, GL_STENCIL_INDEX8, m_size.x, m_size.y, 0, GL_STENCIL_INDEX, GL_UNSIGNED_BYTE, nullptr);
glBindFramebuffer(GL_FRAMEBUFFER, m_fb);
diff --git a/src/render/Framebuffer.hpp b/src/render/Framebuffer.hpp
index 6dbedfee..e6c93876 100644
--- a/src/render/Framebuffer.hpp
+++ b/src/render/Framebuffer.hpp
@@ -3,13 +3,14 @@
#include "../defines.hpp"
#include "../helpers/Format.hpp"
#include "Texture.hpp"
+#include <drm_fourcc.h>
class CFramebuffer {
public:
CFramebuffer();
~CFramebuffer();
- bool alloc(int w, int h, uint32_t format = GL_RGBA);
+ bool alloc(int w, int h, uint32_t format = DRM_FORMAT_ARGB8888);
void addStencil(SP<CTexture> tex);
void bind();
void unbind();
diff --git a/src/render/Texture.cpp b/src/render/Texture.cpp
index f1704afa..5e8c5d40 100644
--- a/src/render/Texture.cpp
+++ b/src/render/Texture.cpp
@@ -73,10 +73,8 @@ void CTexture::createFromShm(uint32_t drmFormat, uint8_t* pixels, uint32_t strid
setTexParameter(GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
setTexParameter(GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
- if (format->flipRB) {
- setTexParameter(GL_TEXTURE_SWIZZLE_R, GL_BLUE);
- setTexParameter(GL_TEXTURE_SWIZZLE_B, GL_RED);
- }
+ if (format->swizzle.has_value())
+ swizzle(format->swizzle.value());
GLCALL(glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, stride / format->bytesPerBlock));
GLCALL(glTexImage2D(GL_TEXTURE_2D, 0, format->glInternalFormat ? format->glInternalFormat : format->glFormat, size_.x, size_.y, 0, format->glFormat, format->glType, pixels));
@@ -96,10 +94,18 @@ void CTexture::createFromDma(const Aquamarine::SDMABUFAttrs& attrs, void* image)
}
m_opaque = NFormatUtils::isFormatOpaque(attrs.format);
+
+ // #TODO external only formats should be external aswell.
+ // also needs a seperate color shader.
+ /*if (NFormatUtils::isFormatYUV(attrs.format)) {
+ m_target = GL_TEXTURE_EXTERNAL_OES;
+ m_type = TEXTURE_EXTERNAL;
+ } else {*/
m_target = GL_TEXTURE_2D;
- m_type = TEXTURE_RGBA;
- m_size = attrs.size;
m_type = NFormatUtils::isFormatOpaque(attrs.format) ? TEXTURE_RGBX : TEXTURE_RGBA;
+ //}
+
+ m_size = attrs.size;
allocate();
m_eglImage = image;
@@ -121,10 +127,8 @@ void CTexture::update(uint32_t drmFormat, uint8_t* pixels, uint32_t stride, cons
bind();
- if (format->flipRB) {
- setTexParameter(GL_TEXTURE_SWIZZLE_R, GL_BLUE);
- setTexParameter(GL_TEXTURE_SWIZZLE_B, GL_RED);
- }
+ if (format->swizzle.has_value())
+ swizzle(format->swizzle.value());
damage.copy().intersect(CBox{{}, m_size}).forEachRect([&format, &stride, &pixels](const auto& rect) {
GLCALL(glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, stride / format->bytesPerBlock));
@@ -205,3 +209,10 @@ void CTexture::setTexParameter(GLenum pname, GLint param) {
m_cachedStates[idx] = param;
GLCALL(glTexParameteri(m_target, pname, param));
}
+
+void CTexture::swizzle(const std::array<GLint, 4>& colors) {
+ setTexParameter(GL_TEXTURE_SWIZZLE_R, colors.at(0));
+ setTexParameter(GL_TEXTURE_SWIZZLE_G, colors.at(1));
+ setTexParameter(GL_TEXTURE_SWIZZLE_B, colors.at(2));
+ setTexParameter(GL_TEXTURE_SWIZZLE_A, colors.at(3));
+}
diff --git a/src/render/Texture.hpp b/src/render/Texture.hpp
index b9811230..8ee2cab0 100644
--- a/src/render/Texture.hpp
+++ b/src/render/Texture.hpp
@@ -37,6 +37,7 @@ class CTexture {
void bind();
void unbind();
void setTexParameter(GLenum pname, GLint param);
+ void swizzle(const std::array<GLint, 4>& colors);
eTextureType m_type = TEXTURE_RGBA;
GLenum m_target = GL_TEXTURE_2D;
diff --git a/src/render/shaders/glsl/CM.frag b/src/render/shaders/glsl/CM.frag
index 031fe7f3..7f075b82 100644
--- a/src/render/shaders/glsl/CM.frag
+++ b/src/render/shaders/glsl/CM.frag
@@ -1,11 +1,9 @@
#version 300 es
-//#extension GL_OES_EGL_image_external : require
#extension GL_ARB_shading_language_include : enable
precision highp float;
in vec2 v_texcoord;
uniform sampler2D tex;
-//uniform samplerExternalOES texture0;
uniform int texType; // eTextureType: 0 - rgba, 1 - rgbx, 2 - ext
// uniform int skipCM;
@@ -30,8 +28,8 @@ void main() {
vec4 pixColor;
if (texType == 1)
pixColor = vec4(texture(tex, v_texcoord).rgb, 1.0);
-// else if (texType == 2)
-// pixColor = texture(texture0, v_texcoord);
+ //else if (texType == 2)
+ // discard; // this shouldnt happen.
else // assume rgba
pixColor = texture(tex, v_texcoord);
diff --git a/src/render/shaders/glsl/ext.frag b/src/render/shaders/glsl/ext.frag
index f540a9f9..e855a832 100644
--- a/src/render/shaders/glsl/ext.frag
+++ b/src/render/shaders/glsl/ext.frag
@@ -5,7 +5,7 @@
precision highp float;
in vec2 v_texcoord;
-uniform samplerExternalOES texture0;
+uniform samplerExternalOES tex;
uniform float alpha;
#include "rounding.glsl"
@@ -20,7 +20,7 @@ uniform vec3 tint;
layout(location = 0) out vec4 fragColor;
void main() {
- vec4 pixColor = texture(texture0, v_texcoord);
+ vec4 pixColor = texture(tex, v_texcoord);
if (discardOpaque == 1 && pixColor[3] * alpha == 1.0)
discard;