diff options
author | Daniel Czarnowski <daniel.czarnowski@intel.com> | 2013-10-21 19:45:35 +0200 |
---|---|---|
committer | Ian Romanick <ian.d.romanick@intel.com> | 2013-10-24 11:16:27 -0700 |
commit | eabb523aa45f3d8940cadac197ef1225fbfd5c56 (patch) | |
tree | 3bd316fc167b4bb1a2937f4954f0e5d96e2d53ef | |
parent | 7ecfab47eb221dbb996ea6c033348b8eceaeb893 (diff) |
glx: Allow float renderType in glXCreateContextAttribsARB
This enables GLX_RGBA_FLOAT_TYPE_ARB and
GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT as valid renderType parameters to
glXCreateContextAttribsARB.
v2 (idr) : Use C-style comments and fix word wrapping. Re-write commit
message.
Signed-off-by: Daniel Czarnowski <daniel.czarnowski@intel.com>
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
-rw-r--r-- | glx/createcontext.c | 2 | ||||
-rw-r--r-- | glx/glxext.h | 16 |
2 files changed, 18 insertions, 0 deletions
diff --git a/glx/createcontext.c b/glx/createcontext.c index 13d21ccb9..41ecd118f 100644 --- a/glx/createcontext.c +++ b/glx/createcontext.c @@ -68,6 +68,8 @@ validate_render_type(uint32_t render_type) switch (render_type) { case GLX_RGBA_TYPE: case GLX_COLOR_INDEX_TYPE: + case GLX_RGBA_FLOAT_TYPE_ARB: + case GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT: return True; default: return False; diff --git a/glx/glxext.h b/glx/glxext.h index 9b0978b93..3f2dee696 100644 --- a/glx/glxext.h +++ b/glx/glxext.h @@ -35,6 +35,22 @@ * Silicon Graphics, Inc. */ +/* doing #include <GL/glx.h> & #include <GL/glxext.h> could cause problems + * with overlapping definitions, so let's use the easy way + */ +#ifndef GLX_RGBA_FLOAT_BIT_ARB +#define GLX_RGBA_FLOAT_BIT_ARB 0x00000004 +#endif +#ifndef GLX_RGBA_FLOAT_TYPE_ARB +#define GLX_RGBA_FLOAT_TYPE_ARB 0x20B9 +#endif +#ifndef GLX_RGBA_UNSIGNED_FLOAT_BIT_EXT +#define GLX_RGBA_UNSIGNED_FLOAT_BIT_EXT 0x00000008 +#endif +#ifndef GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT +#define GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT 0x20B1 +#endif + extern GLboolean __glXFreeContext(__GLXcontext * glxc); extern void __glXFlushContextCache(void); |