diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2011-12-01 14:24:55 -0800 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2011-12-23 08:49:47 -0800 |
| commit | 358ecff1ea0fa8432fd46bd3deeb8d2d694b5550 (patch) | |
| tree | d8e285471e173a607ce1da802a5dbe64a7e1978c /src/gallium/include/state_tracker | |
| parent | ed4a65c3cfdf88afba48860be34ce26f7c371869 (diff) | |
st-api: Clean-up OpenGL profile handling
There seems to have been two different ways to communicate the
profile. There were flags and there were profiles. I've opted to
remove the profile flags and use ST_PROFILE_DEFAULT (compatibility
profile) and ST_PROFILE_OPENGL_CORE (core profile) consistently
instead.
Also change the values of the ST_CONTEXT_FLAG_DEBUG and
ST_CONTEXT_FLAG_FORWARD_COMPATIBLE flags to match the WGL and GLX
values.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Chia-I Wu <olv@lunarg.com>
Diffstat (limited to 'src/gallium/include/state_tracker')
| -rw-r--r-- | src/gallium/include/state_tracker/st_api.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/gallium/include/state_tracker/st_api.h b/src/gallium/include/state_tracker/st_api.h index f7cc2437747..3267cb25ef0 100644 --- a/src/gallium/include/state_tracker/st_api.h +++ b/src/gallium/include/state_tracker/st_api.h @@ -57,10 +57,10 @@ enum st_api_type { */ enum st_profile_type { - ST_PROFILE_DEFAULT, - ST_PROFILE_OPENGL_CORE, - ST_PROFILE_OPENGL_ES1, - ST_PROFILE_OPENGL_ES2 + ST_PROFILE_DEFAULT, /**< OpenGL compatibility profile */ + ST_PROFILE_OPENGL_CORE, /**< OpenGL 3.2+ core profile */ + ST_PROFILE_OPENGL_ES1, /**< OpenGL ES 1.x */ + ST_PROFILE_OPENGL_ES2 /**< OpenGL ES 2.0 */ }; /* for profile_mask in st_api */ @@ -71,12 +71,13 @@ enum st_profile_type /** * New context flags for GL 3.0 and beyond. + * + * Profile information (core vs. compatibilty for OpenGL 3.2+) is communicated + * through the \c st_profile_type, not through flags. */ -#define ST_CONTEXT_FLAG_CORE_PROFILE (1 << 0) -#define ST_CONTEXT_FLAG_COMPATIBLE_PROFILE (1 << 1) -#define ST_CONTEXT_FLAG_FORWARD_COMPATIBLE (1 << 2) -#define ST_CONTEXT_FLAG_DEBUG (1 << 3) -#define ST_CONTEXT_FLAG_ROBUST_ACCESS (1 << 4) +#define ST_CONTEXT_FLAG_DEBUG (1 << 0) +#define ST_CONTEXT_FLAG_FORWARD_COMPATIBLE (1 << 1) +#define ST_CONTEXT_FLAG_ROBUST_ACCESS (1 << 2) /** * Used in st_context_iface->teximage. |