ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Request srgb colorspace on wayland

Browse Source
This commit is contained in:
Deve 2017-09-17 21:51:07 +02:00
parent cef65cb98a
commit f6fa44f0df
4 changed files with 73 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
lib/irrlicht/source/Irrlicht/CContextEGL.cpp
View File

@ -262,52 +262,75 @@ bool ContextManagerEGL::chooseConfig()
bool ContextManagerEGL::createSurface() bool ContextManagerEGL::createSurface()
{ {
if (m_creation_params.surface_type == CEGL_SURFACE_WINDOW) unsigned int colorspace_attr_pos = 0;
unsigned int largest_pbuffer_attr_pos = 0;
std::vector<EGLint> attribs;
if (m_creation_params.opengl_api == CEGL_API_OPENGL)
{ {
if (m_egl_surface == EGL_NO_SURFACE) if (hasEGLExtension("EGL_KHR_gl_colorspace") || m_egl_version >= 150)
{ {
m_egl_surface = eglCreateWindowSurface(m_egl_display, m_egl_config, attribs.push_back(EGL_GL_COLORSPACE);
m_egl_window, NULL); attribs.push_back(m_creation_params.handle_srgb ?
EGL_GL_COLORSPACE_SRGB : EGL_GL_COLORSPACE_LINEAR);
colorspace_attr_pos = attribs.size() - 1;
} }
}
if (m_creation_params.surface_type == CEGL_SURFACE_PBUFFER)
{
attribs.push_back(EGL_WIDTH);
attribs.push_back(m_creation_params.pbuffer_width);
attribs.push_back(EGL_HEIGHT);
attribs.push_back(m_creation_params.pbuffer_height);
attribs.push_back(EGL_LARGEST_PBUFFER);
attribs.push_back(EGL_FALSE);
largest_pbuffer_attr_pos = attribs.size() - 1;
}
attribs.push_back(EGL_NONE);
attribs.push_back(0);
if (m_egl_surface == EGL_NO_SURFACE) if (m_egl_surface == EGL_NO_SURFACE)
{
if (m_creation_params.surface_type == CEGL_SURFACE_WINDOW)
{ {
m_egl_surface = eglCreateWindowSurface(m_egl_display, m_egl_config, m_egl_surface = eglCreateWindowSurface(m_egl_display, m_egl_config,
0, NULL); m_egl_window, &attribs[0]);
}
} }
else if (m_creation_params.surface_type == CEGL_SURFACE_PBUFFER) else if (m_creation_params.surface_type == CEGL_SURFACE_PBUFFER)
{ {
if (m_egl_surface == EGL_NO_SURFACE) m_egl_surface = eglCreatePbufferSurface(m_egl_display, m_egl_config,
{ &attribs[0]);
std::vector<EGLint> pbuffer_attribs; }
pbuffer_attribs.push_back(EGL_WIDTH);
pbuffer_attribs.push_back(m_creation_params.pbuffer_width);
pbuffer_attribs.push_back(EGL_HEIGHT);
pbuffer_attribs.push_back(m_creation_params.pbuffer_height);
pbuffer_attribs.push_back(EGL_NONE);
pbuffer_attribs.push_back(0);
m_egl_surface = eglCreatePbufferSurface(m_egl_display,
m_egl_config,
&pbuffer_attribs[0]);
} }
if (m_egl_surface == EGL_NO_SURFACE) if (m_egl_surface == EGL_NO_SURFACE && colorspace_attr_pos > 0 &&
m_creation_params.handle_srgb == true)
{ {
std::vector<EGLint> pbuffer_attribs; attribs[colorspace_attr_pos] = EGL_GL_COLORSPACE_LINEAR;
pbuffer_attribs.push_back(EGL_WIDTH);
pbuffer_attribs.push_back(m_creation_params.pbuffer_width);
pbuffer_attribs.push_back(EGL_HEIGHT);
pbuffer_attribs.push_back(m_creation_params.pbuffer_height);
pbuffer_attribs.push_back(EGL_LARGEST_PBUFFER);
pbuffer_attribs.push_back(EGL_TRUE);
pbuffer_attribs.push_back(EGL_NONE);
pbuffer_attribs.push_back(0);
m_egl_surface = eglCreatePbufferSurface(m_egl_display, if (m_creation_params.surface_type == CEGL_SURFACE_WINDOW)
m_egl_config, {
&pbuffer_attribs[0]); m_egl_surface = eglCreateWindowSurface(m_egl_display, m_egl_config,
m_egl_window, &attribs[0]);
}
else if (m_creation_params.surface_type == CEGL_SURFACE_PBUFFER)
{
m_egl_surface = eglCreatePbufferSurface(m_egl_display, m_egl_config,
&attribs[0]);
}
}
if (m_egl_surface == EGL_NO_SURFACE && largest_pbuffer_attr_pos > 0)
{
attribs[largest_pbuffer_attr_pos] = EGL_TRUE;
if (m_creation_params.surface_type == CEGL_SURFACE_PBUFFER)
{
m_egl_surface = eglCreatePbufferSurface(m_egl_display, m_egl_config,
&attribs[0]);
} }
} }

10
lib/irrlicht/source/Irrlicht/CContextEGL.h
View File

@ -30,6 +30,15 @@
#ifndef EGL_CONTEXT_MINOR_VERSION #ifndef EGL_CONTEXT_MINOR_VERSION
#define EGL_CONTEXT_MINOR_VERSION 0x30FB #define EGL_CONTEXT_MINOR_VERSION 0x30FB
#endif #endif
#ifndef EGL_GL_COLORSPACE
#define EGL_GL_COLORSPACE 0x309D
#endif
#ifndef EGL_GL_COLORSPACE_SRGB
#define EGL_GL_COLORSPACE_SRGB 0x3089
#endif
#ifndef EGL_GL_COLORSPACE_LINEAR
#define EGL_GL_COLORSPACE_LINEAR 0x308A
#endif
enum ContextEGLOpenGLAPI enum ContextEGLOpenGLAPI
{ {
@ -50,6 +59,7 @@ struct ContextEGLParams
EGLNativeWindowType window; EGLNativeWindowType window;
EGLNativeDisplayType display; EGLNativeDisplayType display;
bool force_legacy_device; bool force_legacy_device;
bool handle_srgb;
bool with_alpha_channel; bool with_alpha_channel;
bool vsync_enabled; bool vsync_enabled;
int pbuffer_width; int pbuffer_width;

1
lib/irrlicht/source/Irrlicht/CIrrDeviceWayland.cpp
View File

@ -794,6 +794,7 @@ bool CIrrDeviceWayland::initEGL()
egl_params.surface_type = CEGL_SURFACE_WINDOW; egl_params.surface_type = CEGL_SURFACE_WINDOW;
egl_params.force_legacy_device = CreationParams.ForceLegacyDevice; egl_params.force_legacy_device = CreationParams.ForceLegacyDevice;
egl_params.handle_srgb = CreationParams.HandleSRGB;
egl_params.with_alpha_channel = CreationParams.WithAlphaChannel; egl_params.with_alpha_channel = CreationParams.WithAlphaChannel;
egl_params.vsync_enabled = CreationParams.Vsync; egl_params.vsync_enabled = CreationParams.Vsync;
egl_params.window = m_egl_window; egl_params.window = m_egl_window;

1
lib/irrlicht/source/Irrlicht/COGLES2Driver.cpp
View File

@ -69,6 +69,7 @@ namespace video
ContextEGLParams egl_params; ContextEGLParams egl_params;
egl_params.opengl_api = CEGL_API_OPENGL_ES; egl_params.opengl_api = CEGL_API_OPENGL_ES;
egl_params.surface_type = CEGL_SURFACE_WINDOW; egl_params.surface_type = CEGL_SURFACE_WINDOW;
egl_params.handle_srgb = Params.HandleSRGB;
egl_params.force_legacy_device = Params.ForceLegacyDevice; egl_params.force_legacy_device = Params.ForceLegacyDevice;
egl_params.with_alpha_channel = Params.WithAlphaChannel; egl_params.with_alpha_channel = Params.WithAlphaChannel;
egl_params.vsync_enabled = Params.Vsync; egl_params.vsync_enabled = Params.Vsync;