diff options
| author | Eric Anholt <eric@anholt.net> | 2013-04-10 10:04:11 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2013-04-29 11:41:34 -0700 |
| commit | 40b207b62f7f3f4dce3eb2d8dd3fb01b88a56ad3 (patch) | |
| tree | fd1072001e32b9bdee9b2ed3f23c07c9e4f1228a /src/mesa | |
| parent | 072709da91d403fc9ee69b3a9d4978ae7b24549a (diff) | |
mesa: Fix error checking for GS UBO getters.
These are supposed to be present if both things are available, but we were
enabling them if either one was.
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/main/get.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c index adb7bd2312f..f4981182ced 100644 --- a/src/mesa/main/get.c +++ b/src/mesa/main/get.c @@ -141,6 +141,7 @@ enum value_extra { EXTRA_VALID_CLIP_DISTANCE, EXTRA_FLUSH_CURRENT, EXTRA_GLSL_130, + EXTRA_EXT_UBO_GS4, }; #define NO_EXTRA NULL @@ -312,8 +313,7 @@ static const int extra_ARB_transform_feedback2_api_es3[] = { }; static const int extra_ARB_uniform_buffer_object_and_geometry_shader[] = { - EXT(ARB_uniform_buffer_object), - EXT(ARB_geometry_shader4), + EXTRA_EXT_UBO_GS4, EXTRA_END }; @@ -985,6 +985,11 @@ check_extra(struct gl_context *ctx, const char *func, const struct value_desc *d if (ctx->Const.GLSLVersion >= 130) api_found = GL_TRUE; break; + case EXTRA_EXT_UBO_GS4: + api_check = GL_TRUE; + api_found = (ctx->Extensions.ARB_uniform_buffer_object && + ctx->Extensions.ARB_geometry_shader4); + break; case EXTRA_END: break; default: /* *e is a offset into the extension struct */ |