Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

renderer: fix legacy_renderer build #3732

Merged
merged 1 commit into from
Nov 3, 2023

Conversation

pastalian
Copy link
Contributor

Describe your PR, what does it fix/add?

4b592d0 added GL_RGB10_A2 and GL_UNSIGNED_INT_2_10_10_10_REV, which are defined in GLES2 as GL_RGB10_A2_EXT and GL_UNSIGNED_INT_2_10_10_10_REV_EXT respectively. This causes legacy_renderer builds to fail.

[30/90] Building CXX object CMakeFiles/Hyprland.dir/src/helpers/MiscFunctions.cpp.o
FAILED: CMakeFiles/Hyprland.dir/src/helpers/MiscFunctions.cpp.o 
/usr/bin/c++ -DHAS_EXECINFO -DHyprland_EXPORTS -DLEGACY_RENDERER -DWLR_USE_UNSTABLE -I/home/me/src/Hyprland/. -I/home/me/src/Hyprland/src -I/home/me/src/Hyprland/subprojects/wlroots/include -I/home/me/src/Hyprland/subprojects/wlroots/build/include -I/home/me/src/Hyprland/subprojects/udis86 -I/home/me/src/Hyprland/protocols -I/home/me/src/Hyprland/subprojects/udis86/libudis86 -isystem /usr/include/libdrm -isystem /usr/include/pango-1.0 -isystem /usr/include/cairo -isystem /usr/include/glib-2.0 -isystem /usr/lib64/glib-2.0/include -isystem /usr/include/pixman-1 -isystem /usr/include/freetype2 -isystem /usr/include/harfbuzz -isystem /usr/include/blkid -isystem /usr/include/fribidi -isystem /usr/include/libmount -isystem /usr/include/libpng16 -isystem /usr/lib64/libffi/include -O3 -DNDEBUG -std=gnu++23 -O3 -Wall -Wextra -Wno-unused-parameter -Wno-unused-value -Wno-missing-field-initializers -Wno-narrowing -Wno-pointer-arith -pthread -Winvalid-pch -include /home/me/src/Hyprland/build/CMakeFiles/Hyprland.dir/cmake_pch.hxx -MD -MT CMakeFiles/Hyprland.dir/src/helpers/MiscFunctions.cpp.o -MF CMakeFiles/Hyprland.dir/src/helpers/MiscFunctions.cpp.o.d -o CMakeFiles/Hyprland.dir/src/helpers/MiscFunctions.cpp.o -c /home/me/src/Hyprland/src/helpers/MiscFunctions.cpp
/home/me/src/Hyprland/src/helpers/MiscFunctions.cpp: In function ‘uint32_t drmFormatToGL(uint32_t)’:
/home/me/src/Hyprland/src/helpers/MiscFunctions.cpp:760:45: error: ‘GL_RGB10_A2’ was not declared in this scope; did you mean ‘GL_RGB10_EXT’?
  760 |         case DRM_FORMAT_XBGR2101010: return GL_RGB10_A2;
      |                                             ^~~~~~~~~~~
      |                                             GL_RGB10_EXT

Is it ready for merging, or does it need work?

Ready.

In GLES2, `GL_RGB10_A2` and `GL_UNSIGNED_INT_2_10_10_10_REV` are defined as
`GL_RGB10_A2_EXT` and `GL_UNSIGNED_INT_2_10_10_10_REV_EXT` respectively.
Copy link
Member

@vaxerski vaxerski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, thanks!

@vaxerski vaxerski merged commit 49fdffa into hyprwm:main Nov 3, 2023
11 checks passed
thejch pushed a commit to thejch/Hyprland that referenced this pull request Nov 15, 2023
In GLES2, `GL_RGB10_A2` and `GL_UNSIGNED_INT_2_10_10_10_REV` are defined as
`GL_RGB10_A2_EXT` and `GL_UNSIGNED_INT_2_10_10_10_REV_EXT` respectively.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants