Skip to content

Commit

Permalink
OpenGL examples: pass correct context creation configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
@fincs
fincs committed Sep 14, 2018
1 parent 012423e commit 1643d44
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 12 deletions.
11 changes: 8 additions & 3 deletions graphics/opengl/es2gears/source/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,14 +121,14 @@ static bool initEgl()
// Get an appropriate EGL framebuffer configuration
EGLConfig config;
EGLint numConfigs;
static const EGLint attributeList[] =
static const EGLint framebufferAttributeList[] =
{
EGL_RED_SIZE, 1,
EGL_GREEN_SIZE, 1,
EGL_BLUE_SIZE, 1,
EGL_NONE
};
eglChooseConfig(s_display, attributeList, &config, 1, &numConfigs);
eglChooseConfig(s_display, framebufferAttributeList, &config, 1, &numConfigs);
if (numConfigs == 0)
{
TRACE("No config found! error: %d", eglGetError());
Expand All @@ -144,7 +144,12 @@ static bool initEgl()
}

// Create an EGL rendering context
s_context = eglCreateContext(s_display, config, EGL_NO_CONTEXT, NULL);
static const EGLint contextAttributeList[] =
{
EGL_CONTEXT_CLIENT_VERSION, 2, // request OpenGL ES 2.x
EGL_NONE
};
s_context = eglCreateContext(s_display, config, EGL_NO_CONTEXT, contextAttributeList);
if (!s_context)
{
TRACE("Context creation failed! error: %d", eglGetError());
Expand Down
14 changes: 11 additions & 3 deletions graphics/opengl/lenny/source/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include <switch.h>

#include <EGL/egl.h> // EGL library
#include <EGL/eglext.h> // EGL extensions
#include <glad/glad.h> // glad library (OpenGL loader)

// GLM headers
Expand Down Expand Up @@ -96,14 +97,14 @@ static bool initEgl()
// Get an appropriate EGL framebuffer configuration
EGLConfig config;
EGLint numConfigs;
static const EGLint attributeList[] =
static const EGLint framebufferAttributeList[] =
{
EGL_RED_SIZE, 1,
EGL_GREEN_SIZE, 1,
EGL_BLUE_SIZE, 1,
EGL_NONE
};
eglChooseConfig(s_display, attributeList, &config, 1, &numConfigs);
eglChooseConfig(s_display, framebufferAttributeList, &config, 1, &numConfigs);
if (numConfigs == 0)
{
TRACE("No config found! error: %d", eglGetError());
Expand All @@ -119,7 +120,14 @@ static bool initEgl()
}

// Create an EGL rendering context
s_context = eglCreateContext(s_display, config, EGL_NO_CONTEXT, nullptr);
static const EGLint contextAttributeList[] =
{
EGL_CONTEXT_OPENGL_PROFILE_MASK_KHR, EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT_KHR,
EGL_CONTEXT_MAJOR_VERSION_KHR, 4,
EGL_CONTEXT_MINOR_VERSION_KHR, 3,
EGL_NONE
};
s_context = eglCreateContext(s_display, config, EGL_NO_CONTEXT, contextAttributeList);
if (!s_context)
{
TRACE("Context creation failed! error: %d", eglGetError());
Expand Down
14 changes: 11 additions & 3 deletions graphics/opengl/simple_triangle/source/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include <switch.h>

#include <EGL/egl.h> // EGL library
#include <EGL/eglext.h> // EGL extensions
#include <glad/glad.h> // glad library (OpenGL loader)

//-----------------------------------------------------------------------------
Expand Down Expand Up @@ -83,14 +84,14 @@ static bool initEgl()
// Get an appropriate EGL framebuffer configuration
EGLConfig config;
EGLint numConfigs;
static const EGLint attributeList[] =
static const EGLint framebufferAttributeList[] =
{
EGL_RED_SIZE, 1,
EGL_GREEN_SIZE, 1,
EGL_BLUE_SIZE, 1,
EGL_NONE
};
eglChooseConfig(s_display, attributeList, &config, 1, &numConfigs);
eglChooseConfig(s_display, framebufferAttributeList, &config, 1, &numConfigs);
if (numConfigs == 0)
{
TRACE("No config found! error: %d", eglGetError());
Expand All @@ -106,7 +107,14 @@ static bool initEgl()
}

// Create an EGL rendering context
s_context = eglCreateContext(s_display, config, EGL_NO_CONTEXT, nullptr);
static const EGLint contextAttributeList[] =
{
EGL_CONTEXT_OPENGL_PROFILE_MASK_KHR, EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT_KHR,
EGL_CONTEXT_MAJOR_VERSION_KHR, 4,
EGL_CONTEXT_MINOR_VERSION_KHR, 3,
EGL_NONE
};
s_context = eglCreateContext(s_display, config, EGL_NO_CONTEXT, contextAttributeList);
if (!s_context)
{
TRACE("Context creation failed! error: %d", eglGetError());
Expand Down
14 changes: 11 additions & 3 deletions graphics/opengl/textured_cube/source/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include <switch.h>

#include <EGL/egl.h> // EGL library
#include <EGL/eglext.h> // EGL extensions
#include <glad/glad.h> // glad library (OpenGL loader)

// GLM headers
Expand Down Expand Up @@ -96,14 +97,14 @@ static bool initEgl()
// Get an appropriate EGL framebuffer configuration
EGLConfig config;
EGLint numConfigs;
static const EGLint attributeList[] =
static const EGLint framebufferAttributeList[] =
{
EGL_RED_SIZE, 1,
EGL_GREEN_SIZE, 1,
EGL_BLUE_SIZE, 1,
EGL_NONE
};
eglChooseConfig(s_display, attributeList, &config, 1, &numConfigs);
eglChooseConfig(s_display, framebufferAttributeList, &config, 1, &numConfigs);
if (numConfigs == 0)
{
TRACE("No config found! error: %d", eglGetError());
Expand All @@ -119,7 +120,14 @@ static bool initEgl()
}

// Create an EGL rendering context
s_context = eglCreateContext(s_display, config, EGL_NO_CONTEXT, nullptr);
static const EGLint contextAttributeList[] =
{
EGL_CONTEXT_OPENGL_PROFILE_MASK_KHR, EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT_KHR,
EGL_CONTEXT_MAJOR_VERSION_KHR, 4,
EGL_CONTEXT_MINOR_VERSION_KHR, 3,
EGL_NONE
};
s_context = eglCreateContext(s_display, config, EGL_NO_CONTEXT, contextAttributeList);
if (!s_context)
{
TRACE("Context creation failed! error: %d", eglGetError());
Expand Down

0 comments on commit 1643d44

Please sign in to comment.