egl: Introduce config keys.
Config keys are almost config attributes. A valid config attribute is a valid config key, but a valid config key may not be a valid config attribute. This commit does not distinguish the differences. Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
This commit is contained in:
parent
7cda8ea44c
commit
358c5a8fd1
|
@ -177,7 +177,7 @@ demoCreatePixmapSurface(_EGLDriver *drv, _EGLDisplay *dpy, _EGLConfig *conf, Nat
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (conf->Attrib[EGL_SURFACE_TYPE - FIRST_ATTRIB] == 0) {
|
if (GET_CONFIG_ATTRIB(conf, EGL_SURFACE_TYPE) == 0) {
|
||||||
_eglError(EGL_BAD_MATCH, "eglCreatePixmapSurface");
|
_eglError(EGL_BAD_MATCH, "eglCreatePixmapSurface");
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,15 +17,6 @@
|
||||||
#define MIN2(A, B) (((A) < (B)) ? (A) : (B))
|
#define MIN2(A, B) (((A) < (B)) ? (A) : (B))
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
_eglSetConfigAttrib(_EGLConfig *config, EGLint attr, EGLint val)
|
|
||||||
{
|
|
||||||
assert(attr >= FIRST_ATTRIB);
|
|
||||||
assert(attr < FIRST_ATTRIB + MAX_ATTRIBS);
|
|
||||||
config->Attrib[attr - FIRST_ATTRIB] = val;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Init the given _EGLconfig to default values.
|
* Init the given _EGLconfig to default values.
|
||||||
* \param id the configuration's ID.
|
* \param id the configuration's ID.
|
||||||
|
@ -128,21 +119,16 @@ _eglParseConfigAttribs(_EGLConfig *config, const EGLint *attrib_list)
|
||||||
EGLint i;
|
EGLint i;
|
||||||
|
|
||||||
/* set all config attribs to EGL_DONT_CARE */
|
/* set all config attribs to EGL_DONT_CARE */
|
||||||
for (i = 0; i < MAX_ATTRIBS; i++) {
|
_eglResetConfigKeys(config, EGL_DONT_CARE);
|
||||||
config->Attrib[i] = EGL_DONT_CARE;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* by default choose windows unless otherwise specified */
|
/* by default choose windows unless otherwise specified */
|
||||||
config->Attrib[EGL_SURFACE_TYPE - FIRST_ATTRIB] = EGL_WINDOW_BIT;
|
SET_CONFIG_ATTRIB(config, EGL_SURFACE_TYPE, EGL_WINDOW_BIT);
|
||||||
|
|
||||||
for (i = 0; attrib_list && attrib_list[i] != EGL_NONE; i++) {
|
for (i = 0; attrib_list && attrib_list[i] != EGL_NONE; i++) {
|
||||||
const EGLint attr = attrib_list[i];
|
const EGLint attr = attrib_list[i];
|
||||||
if (attr >= EGL_BUFFER_SIZE &&
|
if (attr >= EGL_BUFFER_SIZE &&
|
||||||
attr <= EGL_MAX_SWAP_INTERVAL) {
|
attr <= EGL_MAX_SWAP_INTERVAL) {
|
||||||
EGLint k = attr - FIRST_ATTRIB;
|
SET_CONFIG_ATTRIB(config, attr, attrib_list[++i]);
|
||||||
assert(k >= 0);
|
|
||||||
assert(k < MAX_ATTRIBS);
|
|
||||||
config->Attrib[k] = attrib_list[++i];
|
|
||||||
}
|
}
|
||||||
#ifdef EGL_VERSION_1_2
|
#ifdef EGL_VERSION_1_2
|
||||||
else if (attr == EGL_COLOR_BUFFER_TYPE) {
|
else if (attr == EGL_COLOR_BUFFER_TYPE) {
|
||||||
|
@ -368,9 +354,9 @@ EGLBoolean
|
||||||
_eglGetConfigAttrib(_EGLDriver *drv, _EGLDisplay *dpy, _EGLConfig *conf,
|
_eglGetConfigAttrib(_EGLDriver *drv, _EGLDisplay *dpy, _EGLConfig *conf,
|
||||||
EGLint attribute, EGLint *value)
|
EGLint attribute, EGLint *value)
|
||||||
{
|
{
|
||||||
const EGLint k = attribute - FIRST_ATTRIB;
|
const EGLint k = attribute - _EGL_CONFIG_FIRST_ATTRIB;
|
||||||
if (k >= 0 && k < MAX_ATTRIBS) {
|
if (k >= 0 && k < _EGL_CONFIG_NUM_ATTRIBS) {
|
||||||
*value = conf->Attrib[k];
|
*value = GET_CONFIG_ATTRIB(conf, k);
|
||||||
return EGL_TRUE;
|
return EGL_TRUE;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|
|
@ -2,27 +2,93 @@
|
||||||
#define EGLCONFIG_INCLUDED
|
#define EGLCONFIG_INCLUDED
|
||||||
|
|
||||||
|
|
||||||
|
#include <assert.h>
|
||||||
#include "egltypedefs.h"
|
#include "egltypedefs.h"
|
||||||
#include <GLES/gl.h>
|
|
||||||
|
|
||||||
|
|
||||||
#define MAX_ATTRIBS 128
|
#define _EGL_CONFIG_FIRST_ATTRIB EGL_BUFFER_SIZE
|
||||||
#define FIRST_ATTRIB EGL_BUFFER_SIZE
|
#define _EGL_CONFIG_LAST_ATTRIB EGL_CONFORMANT
|
||||||
|
#define _EGL_CONFIG_NUM_ATTRIBS \
|
||||||
|
(_EGL_CONFIG_LAST_ATTRIB - _EGL_CONFIG_FIRST_ATTRIB + 1)
|
||||||
|
|
||||||
|
#define _EGL_CONFIG_STORAGE_SIZE _EGL_CONFIG_NUM_ATTRIBS
|
||||||
|
|
||||||
|
|
||||||
struct _egl_config
|
struct _egl_config
|
||||||
{
|
{
|
||||||
EGLConfig Handle; /* the public/opaque handle which names this config */
|
EGLConfig Handle; /* the public/opaque handle which names this config */
|
||||||
EGLint Attrib[MAX_ATTRIBS];
|
EGLint Storage[_EGL_CONFIG_STORAGE_SIZE];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
#define SET_CONFIG_ATTRIB(CONF, ATTR, VAL) \
|
#define SET_CONFIG_ATTRIB(CONF, ATTR, VAL) _eglSetConfigKey(CONF, ATTR, VAL)
|
||||||
assert((ATTR) - FIRST_ATTRIB < MAX_ATTRIBS); \
|
#define GET_CONFIG_ATTRIB(CONF, ATTR) _eglGetConfigKey(CONF, ATTR)
|
||||||
((CONF)->Attrib[(ATTR) - FIRST_ATTRIB] = VAL)
|
|
||||||
|
|
||||||
|
|
||||||
#define GET_CONFIG_ATTRIB(CONF, ATTR) ((CONF)->Attrib[(ATTR) - FIRST_ATTRIB])
|
/**
|
||||||
|
* Given a key, return an index into the storage of the config.
|
||||||
|
* Return -1 if the key is invalid.
|
||||||
|
*/
|
||||||
|
static INLINE EGLint
|
||||||
|
_eglIndexConfig(const _EGLConfig *conf, EGLint key)
|
||||||
|
{
|
||||||
|
(void) conf;
|
||||||
|
if (key >= _EGL_CONFIG_FIRST_ATTRIB &&
|
||||||
|
key < _EGL_CONFIG_FIRST_ATTRIB + _EGL_CONFIG_NUM_ATTRIBS)
|
||||||
|
return key - _EGL_CONFIG_FIRST_ATTRIB;
|
||||||
|
else
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reset all keys in the config to a given value.
|
||||||
|
*/
|
||||||
|
static INLINE void
|
||||||
|
_eglResetConfigKeys(_EGLConfig *conf, EGLint val)
|
||||||
|
{
|
||||||
|
EGLint i;
|
||||||
|
for (i = 0; i < _EGL_CONFIG_NUM_ATTRIBS; i++)
|
||||||
|
conf->Storage[i] = val;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Update a config for a given key.
|
||||||
|
*/
|
||||||
|
static INLINE void
|
||||||
|
_eglSetConfigKey(_EGLConfig *conf, EGLint key, EGLint val)
|
||||||
|
{
|
||||||
|
EGLint idx = _eglIndexConfig(conf, key);
|
||||||
|
assert(idx >= 0);
|
||||||
|
conf->Storage[idx] = val;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return the value for a given key.
|
||||||
|
*/
|
||||||
|
static INLINE EGLint
|
||||||
|
_eglGetConfigKey(const _EGLConfig *conf, EGLint key)
|
||||||
|
{
|
||||||
|
EGLint idx = _eglIndexConfig(conf, key);
|
||||||
|
assert(idx >= 0);
|
||||||
|
return conf->Storage[idx];
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set a given attribute.
|
||||||
|
*
|
||||||
|
* Because _eglGetConfigAttrib is already used as a fallback driver
|
||||||
|
* function, this function is not considered to have a good name.
|
||||||
|
* SET_CONFIG_ATTRIB is preferred over this function.
|
||||||
|
*/
|
||||||
|
static INLINE void
|
||||||
|
_eglSetConfigAttrib(_EGLConfig *conf, EGLint attr, EGLint val)
|
||||||
|
{
|
||||||
|
SET_CONFIG_ATTRIB(conf, attr, val);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
extern void
|
extern void
|
||||||
|
@ -57,8 +123,4 @@ extern EGLBoolean
|
||||||
_eglGetConfigs(_EGLDriver *drv, _EGLDisplay *dpy, EGLConfig *configs, EGLint config_size, EGLint *num_config);
|
_eglGetConfigs(_EGLDriver *drv, _EGLDisplay *dpy, EGLConfig *configs, EGLint config_size, EGLint *num_config);
|
||||||
|
|
||||||
|
|
||||||
extern void
|
|
||||||
_eglSetConfigAttrib(_EGLConfig *config, EGLint attr, EGLint val);
|
|
||||||
|
|
||||||
|
|
||||||
#endif /* EGLCONFIG_INCLUDED */
|
#endif /* EGLCONFIG_INCLUDED */
|
||||||
|
|
|
@ -1,12 +1,10 @@
|
||||||
|
|
||||||
#ifndef EGLCONFIGUTIL_INCLUDED
|
#ifndef EGLCONFIGUTIL_INCLUDED
|
||||||
#define EGLCONFIGUTIL_INCLUDED
|
#define EGLCONFIGUTIL_INCLUDED
|
||||||
|
|
||||||
#include "eglconfig.h"
|
|
||||||
|
#include "GLES/gl.h"
|
||||||
#include "GL/internal/glcore.h"
|
#include "GL/internal/glcore.h"
|
||||||
#if (!defined(WIN32) && !defined(_WIN32_WCE))
|
#include "eglconfig.h"
|
||||||
#include "stdint.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
extern void
|
extern void
|
||||||
|
|
Loading…
Reference in New Issue