[Mesa-dev] [PATCH 1/2] glx: add support for GLX_ARB_create_context_no_error
Timothy Arceri
tarceri at itsqueeze.com
Thu Aug 24 02:30:55 UTC 2017
On 04/08/17 04:26, Grigori Goronzy wrote:
> Hi,
>
> there also is a patch needed to make this work for Xorg on the
> xorg-devel list as well as preliminary piglit test to verify the
> functionality on the piglit list.
Hi Emil,
Any chance you can take a look at this series? I feel you are much more
familiar with this code than I am.
Thanks,
Tim
>
> Grigori
>
> On 2017-08-03 20:07, Grigori Goronzy wrote:
>> ---
>> src/glx/dri2_glx.c | 12 ++++++++++++
>> src/glx/dri3_glx.c | 8 ++++++++
>> src/glx/dri_common.c | 52
>> ++++++++++++++++++++++++++++++++++++++++++++++++-
>> src/glx/dri_common.h | 5 +++++
>> src/glx/drisw_glx.c | 3 +++
>> src/glx/glxclient.h | 6 ++++++
>> src/glx/glxextensions.c | 1 +
>> src/glx/glxextensions.h | 1 +
>> 8 files changed, 87 insertions(+), 1 deletion(-)
>>
>> diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c
>> index ae8cb11..263f864 100644
>> --- a/src/glx/dri2_glx.c
>> +++ b/src/glx/dri2_glx.c
>> @@ -262,6 +262,10 @@ dri2_create_context_attribs(struct glx_screen *base,
>> &api, &reset, error))
>> goto error_exit;
>>
>> + if (!dri2_check_no_error(flags, shareList, major_ver, error)) {
>> + goto error_exit;
>> + }
>> +
>> /* Check the renderType value */
>> if (!validate_renderType_against_config(config_base, renderType))
>> goto error_exit;
>> @@ -1159,6 +1163,14 @@ dri2BindExtensions(struct dri2_screen *psc,
>> struct glx_display * priv,
>> __glXEnableDirectExtension(&psc->base,
>> "GLX_ARB_create_context_robustness");
>>
>> + /* DRI2 version 3 is also required because
>> + * GLX_ARB_create_context_no_error requires
>> GLX_ARB_create_context.
>> + */
>> + if (psc->dri2->base.version >= 3
>> + && strcmp(extensions[i]->name, __DRI2_NO_ERROR) == 0)
>> + __glXEnableDirectExtension(&psc->base,
>> + "GLX_ARB_create_context_no_error");
>> +
>> /* DRI2 version 3 is also required because GLX_MESA_query_renderer
>> * requires GLX_ARB_create_context_profile.
>> */
>> diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c
>> index 5091606..19667fa 100644
>> --- a/src/glx/dri3_glx.c
>> +++ b/src/glx/dri3_glx.c
>> @@ -283,6 +283,10 @@ dri3_create_context_attribs(struct glx_screen *base,
>> &reset, error))
>> goto error_exit;
>>
>> + if (!dri2_check_no_error(flags, shareList, major_ver, error)) {
>> + goto error_exit;
>> + }
>> +
>> /* Check the renderType value */
>> if (!validate_renderType_against_config(config_base, render_type))
>> goto error_exit;
>> @@ -754,6 +758,10 @@ dri3_bind_extensions(struct dri3_screen *psc,
>> struct glx_display * priv,
>> __glXEnableDirectExtension(&psc->base,
>> "GLX_ARB_create_context_robustness");
>>
>> + if (strcmp(extensions[i]->name, __DRI2_NO_ERROR) == 0)
>> + __glXEnableDirectExtension(&psc->base,
>> + "GLX_ARB_create_context_no_error");
>> +
>> if (strcmp(extensions[i]->name, __DRI2_RENDERER_QUERY) == 0) {
>> psc->rendererQuery = (__DRI2rendererQueryExtension *)
>> extensions[i];
>> __glXEnableDirectExtension(&psc->base,
>> "GLX_MESA_query_renderer");
>> diff --git a/src/glx/dri_common.c b/src/glx/dri_common.c
>> index 854733a..2cab207 100644
>> --- a/src/glx/dri_common.c
>> +++ b/src/glx/dri_common.c
>> @@ -468,6 +468,7 @@ dri2_convert_glx_attribs(unsigned num_attribs,
>> const uint32_t *attribs,
>> {
>> unsigned i;
>> bool got_profile = false;
>> + int no_error = 0;
>> uint32_t profile;
>>
>> *major_ver = 1;
>> @@ -499,6 +500,9 @@ dri2_convert_glx_attribs(unsigned num_attribs,
>> const uint32_t *attribs,
>> case GLX_CONTEXT_FLAGS_ARB:
>> *flags = attribs[i * 2 + 1];
>> break;
>> + case GLX_CONTEXT_OPENGL_NO_ERROR_ARB:
>> + no_error = attribs[i * 2 + 1];
>> + break;
>> case GLX_CONTEXT_PROFILE_MASK_ARB:
>> profile = attribs[i * 2 + 1];
>> got_profile = true;
>> @@ -527,6 +531,10 @@ dri2_convert_glx_attribs(unsigned num_attribs,
>> const uint32_t *attribs,
>> }
>> }
>>
>> + if (no_error) {
>> + *flags |= __DRI_CTX_FLAG_NO_ERROR;
>> + }
>> +
>> if (!got_profile) {
>> if (*major_ver > 3 || (*major_ver == 3 && *minor_ver >= 2))
>> *api = __DRI_API_OPENGL_CORE;
>> @@ -567,7 +575,8 @@ dri2_convert_glx_attribs(unsigned num_attribs,
>> const uint32_t *attribs,
>> /* Unknown flag value.
>> */
>> if (*flags & ~(__DRI_CTX_FLAG_DEBUG |
>> __DRI_CTX_FLAG_FORWARD_COMPATIBLE
>> - | __DRI_CTX_FLAG_ROBUST_BUFFER_ACCESS)) {
>> + | __DRI_CTX_FLAG_ROBUST_BUFFER_ACCESS
>> + | __DRI_CTX_FLAG_NO_ERROR)) {
>> *error = __DRI_CTX_ERROR_UNKNOWN_FLAG;
>> return false;
>> }
>> @@ -592,4 +601,45 @@ dri2_convert_glx_attribs(unsigned num_attribs,
>> const uint32_t *attribs,
>> return true;
>> }
>>
>> +_X_HIDDEN bool
>> +dri2_check_no_error(uint32_t flags, struct glx_context *share_context,
>> + int major, unsigned *error)
>> +{
>> + Bool noError = flags & __DRI_CTX_FLAG_NO_ERROR;
>> +
>> + /* The KHR_no_error specs say:
>> + *
>> + * Requires OpenGL ES 2.0 or OpenGL 2.0.
>> + */
>> + if (major < 2) {
>> + *error = __DRI_CTX_ERROR_UNKNOWN_ATTRIBUTE;
>> + return false;
>> + }
>> +
>> + /* The GLX_ARB_create_context_no_error specs say:
>> + *
>> + * BadMatch is generated if the value of
>> GLX_CONTEXT_OPENGL_NO_ERROR_ARB
>> + * used to create <share_context> does not match the value of
>> + * GLX_CONTEXT_OPENGL_NO_ERROR_ARB for the context being created.
>> + */
>> + if (share_context && !!share_context->noError != !!noError) {
>> + *error = __DRI_CTX_ERROR_BAD_FLAG;
>> + return false;
>> + }
>> +
>> + /* The GLX_ARB_create_context_no_error specs say:
>> + *
>> + * BadMatch is generated if the GLX_CONTEXT_OPENGL_NO_ERROR_ARB
>> is TRUE at
>> + * the same time as a debug or robustness context is specified.
>> + *
>> + */
>> + if (noError && ((flags & __DRI_CTX_FLAG_DEBUG) ||
>> + (flags & __DRI_CTX_FLAG_ROBUST_BUFFER_ACCESS))) {
>> + *error = __DRI_CTX_ERROR_BAD_FLAG;
>> + return false;
>> + }
>> +
>> + return true;
>> +}
>> +
>> #endif /* GLX_DIRECT_RENDERING */
>> diff --git a/src/glx/dri_common.h b/src/glx/dri_common.h
>> index 947d331..c5caba3 100644
>> --- a/src/glx/dri_common.h
>> +++ b/src/glx/dri_common.h
>> @@ -80,4 +80,9 @@ dri2_convert_glx_attribs(unsigned num_attribs, const
>> uint32_t *attribs,
>> uint32_t *render_type, uint32_t *flags,
>> unsigned *api,
>> int *reset, unsigned *error);
>>
>> +extern bool
>> +dri2_check_no_error(uint32_t flags, struct glx_context *share_context,
>> + int major, unsigned *error);
>> +
>> +
>> #endif /* _DRI_COMMON_H */
>> diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c
>> index 110b7f8..2ce3922 100644
>> --- a/src/glx/drisw_glx.c
>> +++ b/src/glx/drisw_glx.c
>> @@ -433,6 +433,9 @@ drisw_create_context_attribs(struct glx_screen *base,
>> &api, &reset, error))
>> return NULL;
>>
>> + if (!dri2_check_no_error(flags, shareList, major_ver, error))
>> + return NULL;
>> +
>> /* Check the renderType value */
>> if (!validate_renderType_against_config(config_base, renderType)) {
>> return NULL;
>> diff --git a/src/glx/glxclient.h b/src/glx/glxclient.h
>> index 0d29e56..38647b2 100644
>> --- a/src/glx/glxclient.h
>> +++ b/src/glx/glxclient.h
>> @@ -437,6 +437,12 @@ struct glx_context
>> */
>> unsigned long thread_refcount;
>>
>> + /**
>> + * GLX_ARB_create_context_no_error setting for this context.
>> + * This needs to be kept here to enforce shared context rules.
>> + */
>> + Bool noError;
>> +
>> char gl_extension_bits[__GL_EXT_BYTES];
>> };
>>
>> diff --git a/src/glx/glxextensions.c b/src/glx/glxextensions.c
>> index 22b078c..277de43 100644
>> --- a/src/glx/glxextensions.c
>> +++ b/src/glx/glxextensions.c
>> @@ -133,6 +133,7 @@ struct extension_info
>> /* *INDENT-OFF* */
>> static const struct extension_info known_glx_extensions[] = {
>> { GLX(ARB_create_context), VER(0,0), Y, N, N, N },
>> + { GLX(ARB_create_context_no_error), VER(1,4), Y, N, N, N },
>> { GLX(ARB_create_context_profile), VER(0,0), Y, N, N, N },
>> { GLX(ARB_create_context_robustness), VER(0,0), Y, N, N, N },
>> { GLX(ARB_fbconfig_float), VER(0,0), Y, Y, N, N },
>> diff --git a/src/glx/glxextensions.h b/src/glx/glxextensions.h
>> index 21ad02a..79ce07d 100644
>> --- a/src/glx/glxextensions.h
>> +++ b/src/glx/glxextensions.h
>> @@ -38,6 +38,7 @@ extern "C" {
>> enum
>> {
>> ARB_create_context_bit = 0,
>> + ARB_create_context_no_error_bit,
>> ARB_create_context_profile_bit,
>> ARB_create_context_robustness_bit,
>> ARB_fbconfig_float_bit,
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
More information about the mesa-dev
mailing list