X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fdrivers%2Fdri%2Fcommon%2Fdri_util.c;h=45f614bf720eb2520f3bcf2396141ecc5cc17244;hb=04dc6074cf7f651b720868e0ba24362b585d1b31;hp=dc5260ca5b9715748299f55fecd9edf621b02d74;hpb=6d87500fe12e77ad13db057430964b864cacb055;p=mesa.git diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c index dc5260ca5b9..45f614bf720 100644 --- a/src/mesa/drivers/dri/common/dri_util.c +++ b/src/mesa/drivers/dri/common/dri_util.c @@ -81,6 +81,8 @@ setupLoaderExtensions(__DRIscreen *psp, psp->swrast_loader = (__DRIswrastLoaderExtension *) extensions[i]; if (strcmp(extensions[i]->name, __DRI_IMAGE_LOADER) == 0) psp->image.loader = (__DRIimageLoaderExtension *) extensions[i]; + if (strcmp(extensions[i]->name, __DRI_MUTABLE_RENDER_BUFFER_LOADER) == 0) + psp->mutableRenderBuffer.loader = (__DRImutableRenderBufferLoaderExtension *) extensions[i]; } } @@ -144,6 +146,11 @@ driCreateNewScreen2(int scrn, int fd, psp->fd = fd; psp->myNum = scrn; + /* Option parsing before ->InitScreen(), as some options apply there. */ + driParseOptionInfo(&psp->optionInfo, __dri2ConfigOptions); + driParseConfigFiles(&psp->optionCache, &psp->optionInfo, psp->myNum, + "dri2", NULL, NULL, 0); + *driver_configs = psp->driver->InitScreen(psp); if (*driver_configs == NULL) { free(psp); @@ -160,11 +167,9 @@ driCreateNewScreen2(int scrn, int fd, api = API_OPENGL_COMPAT; if (_mesa_override_gl_version_contextless(&consts, &api, &version)) { - if (api == API_OPENGL_CORE) { - psp->max_gl_core_version = version; - } else { + psp->max_gl_core_version = version; + if (api == API_OPENGL_COMPAT) psp->max_gl_compat_version = version; - } } psp->api_mask = 0; @@ -179,10 +184,6 @@ driCreateNewScreen2(int scrn, int fd, if (psp->max_gl_es2_version >= 30) psp->api_mask |= (1 << __DRI_API_GLES3); - driParseOptionInfo(&psp->optionInfo, __dri2ConfigOptions); - driParseConfigFiles(&psp->optionCache, &psp->optionInfo, psp->myNum, "dri2"); - - return psp; } @@ -361,6 +362,16 @@ driCreateContextAttribs(__DRIscreen *screen, int api, ctx_config.attribute_mask |= __DRIVER_CONTEXT_ATTRIB_PRIORITY; ctx_config.priority = attribs[i * 2 + 1]; break; + case __DRI_CTX_ATTRIB_RELEASE_BEHAVIOR: + if (attribs[i * 2 + 1] != __DRI_CTX_RELEASE_BEHAVIOR_FLUSH) { + ctx_config.attribute_mask |= + __DRIVER_CONTEXT_ATTRIB_RELEASE_BEHAVIOR; + ctx_config.release_behavior = attribs[i * 2 + 1]; + } else { + ctx_config.attribute_mask &= + ~__DRIVER_CONTEXT_ATTRIB_RELEASE_BEHAVIOR; + } + break; default: /* We can't create a context that satisfies the requirements of an * attribute that we don't understand. Return failure. @@ -371,22 +382,16 @@ driCreateContextAttribs(__DRIscreen *screen, int api, } } - /* Mesa does not support the GL_ARB_compatibilty extension or the - * compatibility profile. This means that we treat a API_OPENGL_COMPAT 3.1 as - * API_OPENGL_CORE and reject API_OPENGL_COMPAT 3.2+. + /* The specific Mesa driver may not support the GL_ARB_compatibilty + * extension or the compatibility profile. In that case, we treat an + * API_OPENGL_COMPAT 3.1 as API_OPENGL_CORE. We reject API_OPENGL_COMPAT + * 3.2+ in any case. */ if (mesa_api == API_OPENGL_COMPAT && - ctx_config.major_version == 3 && ctx_config.minor_version == 1) + ctx_config.major_version == 3 && ctx_config.minor_version == 1 && + screen->max_gl_compat_version < 31) mesa_api = API_OPENGL_CORE; - if (mesa_api == API_OPENGL_COMPAT - && ((ctx_config.major_version > 3) - || (ctx_config.major_version == 3 && - ctx_config.minor_version >= 2))) { - *error = __DRI_CTX_ERROR_BAD_API; - return NULL; - } - /* The latest version of EGL_KHR_create_context spec says: * * "If the EGL_CONTEXT_OPENGL_DEBUG_BIT_KHR flag bit is set in @@ -833,6 +838,10 @@ const __DRI2configQueryExtension dri2ConfigQueryExtension = { .configQueryf = dri2ConfigQueryf, }; +const __DRI2flushControlExtension dri2FlushControlExtension = { + .base = { __DRI2_FLUSH_CONTROL, 1 } +}; + void dri2InvalidateDrawable(__DRIdrawable *drawable) { @@ -858,76 +867,122 @@ driUpdateFramebufferSize(struct gl_context *ctx, const __DRIdrawable *dPriv) } } +/* + * Note: the first match is returned, which is important for formats like + * __DRI_IMAGE_FORMAT_R8 which maps to both MESA_FORMAT_{R,L}_UNORM8 + */ +static const struct { + uint32_t image_format; + mesa_format mesa_format; +} format_mapping[] = { + { + .image_format = __DRI_IMAGE_FORMAT_RGB565, + .mesa_format = MESA_FORMAT_B5G6R5_UNORM, + }, + { + .image_format = __DRI_IMAGE_FORMAT_ARGB1555, + .mesa_format = MESA_FORMAT_B5G5R5A1_UNORM, + }, + { + .image_format = __DRI_IMAGE_FORMAT_XRGB8888, + .mesa_format = MESA_FORMAT_B8G8R8X8_UNORM, + }, + { + .image_format = __DRI_IMAGE_FORMAT_ABGR16161616F, + .mesa_format = MESA_FORMAT_RGBA_FLOAT16, + }, + { + .image_format = __DRI_IMAGE_FORMAT_XBGR16161616F, + .mesa_format = MESA_FORMAT_RGBX_FLOAT16, + }, + { + .image_format = __DRI_IMAGE_FORMAT_ARGB2101010, + .mesa_format = MESA_FORMAT_B10G10R10A2_UNORM, + }, + { + .image_format = __DRI_IMAGE_FORMAT_XRGB2101010, + .mesa_format = MESA_FORMAT_B10G10R10X2_UNORM, + }, + { + .image_format = __DRI_IMAGE_FORMAT_ABGR2101010, + .mesa_format = MESA_FORMAT_R10G10B10A2_UNORM, + }, + { + .image_format = __DRI_IMAGE_FORMAT_XBGR2101010, + .mesa_format = MESA_FORMAT_R10G10B10X2_UNORM, + }, + { + .image_format = __DRI_IMAGE_FORMAT_ARGB8888, + .mesa_format = MESA_FORMAT_B8G8R8A8_UNORM, + }, + { + .image_format = __DRI_IMAGE_FORMAT_ABGR8888, + .mesa_format = MESA_FORMAT_R8G8B8A8_UNORM, + }, + { + .image_format = __DRI_IMAGE_FORMAT_XBGR8888, + .mesa_format = MESA_FORMAT_R8G8B8X8_UNORM, + }, + { + .image_format = __DRI_IMAGE_FORMAT_R8, + .mesa_format = MESA_FORMAT_R_UNORM8, + }, + { + .image_format = __DRI_IMAGE_FORMAT_R8, + .mesa_format = MESA_FORMAT_L_UNORM8, + }, + { + .image_format = __DRI_IMAGE_FORMAT_GR88, + .mesa_format = MESA_FORMAT_R8G8_UNORM, + }, + { + .image_format = __DRI_IMAGE_FORMAT_GR88, + .mesa_format = MESA_FORMAT_L8A8_UNORM, + }, + { + .image_format = __DRI_IMAGE_FORMAT_SABGR8, + .mesa_format = MESA_FORMAT_R8G8B8A8_SRGB, + }, + { + .image_format = __DRI_IMAGE_FORMAT_SARGB8, + .mesa_format = MESA_FORMAT_B8G8R8A8_SRGB, + }, + { + .image_format = __DRI_IMAGE_FORMAT_R16, + .mesa_format = MESA_FORMAT_R_UNORM16, + }, + { + .image_format = __DRI_IMAGE_FORMAT_R16, + .mesa_format = MESA_FORMAT_L_UNORM16, + }, + { + .image_format = __DRI_IMAGE_FORMAT_GR1616, + .mesa_format = MESA_FORMAT_R16G16_UNORM, + }, + { + .image_format = __DRI_IMAGE_FORMAT_GR1616, + .mesa_format = MESA_FORMAT_L16A16_UNORM, + }, +}; + uint32_t driGLFormatToImageFormat(mesa_format format) { - switch (format) { - case MESA_FORMAT_B5G6R5_UNORM: - return __DRI_IMAGE_FORMAT_RGB565; - case MESA_FORMAT_B5G5R5A1_UNORM: - return __DRI_IMAGE_FORMAT_ARGB1555; - case MESA_FORMAT_B8G8R8X8_UNORM: - return __DRI_IMAGE_FORMAT_XRGB8888; - case MESA_FORMAT_B10G10R10A2_UNORM: - return __DRI_IMAGE_FORMAT_ARGB2101010; - case MESA_FORMAT_B10G10R10X2_UNORM: - return __DRI_IMAGE_FORMAT_XRGB2101010; - case MESA_FORMAT_B8G8R8A8_UNORM: - return __DRI_IMAGE_FORMAT_ARGB8888; - case MESA_FORMAT_R8G8B8A8_UNORM: - return __DRI_IMAGE_FORMAT_ABGR8888; - case MESA_FORMAT_R8G8B8X8_UNORM: - return __DRI_IMAGE_FORMAT_XBGR8888; - case MESA_FORMAT_L_UNORM8: - case MESA_FORMAT_R_UNORM8: - return __DRI_IMAGE_FORMAT_R8; - case MESA_FORMAT_L8A8_UNORM: - case MESA_FORMAT_R8G8_UNORM: - return __DRI_IMAGE_FORMAT_GR88; - case MESA_FORMAT_NONE: - return __DRI_IMAGE_FORMAT_NONE; - case MESA_FORMAT_B8G8R8A8_SRGB: - return __DRI_IMAGE_FORMAT_SARGB8; - default: - return 0; - } + for (size_t i = 0; i < ARRAY_SIZE(format_mapping); i++) + if (format_mapping[i].mesa_format == format) + return format_mapping[i].image_format; + + return __DRI_IMAGE_FORMAT_NONE; } mesa_format driImageFormatToGLFormat(uint32_t image_format) { - switch (image_format) { - case __DRI_IMAGE_FORMAT_RGB565: - return MESA_FORMAT_B5G6R5_UNORM; - case __DRI_IMAGE_FORMAT_ARGB1555: - return MESA_FORMAT_B5G5R5A1_UNORM; - case __DRI_IMAGE_FORMAT_XRGB8888: - return MESA_FORMAT_B8G8R8X8_UNORM; - case __DRI_IMAGE_FORMAT_ARGB2101010: - return MESA_FORMAT_B10G10R10A2_UNORM; - case __DRI_IMAGE_FORMAT_XRGB2101010: - return MESA_FORMAT_B10G10R10X2_UNORM; - case __DRI_IMAGE_FORMAT_ARGB8888: - return MESA_FORMAT_B8G8R8A8_UNORM; - case __DRI_IMAGE_FORMAT_ABGR8888: - return MESA_FORMAT_R8G8B8A8_UNORM; - case __DRI_IMAGE_FORMAT_XBGR8888: - return MESA_FORMAT_R8G8B8X8_UNORM; - case __DRI_IMAGE_FORMAT_R8: - return MESA_FORMAT_R_UNORM8; - case __DRI_IMAGE_FORMAT_R16: - return MESA_FORMAT_R_UNORM16; - case __DRI_IMAGE_FORMAT_GR88: - return MESA_FORMAT_R8G8_UNORM; - case __DRI_IMAGE_FORMAT_GR1616: - return MESA_FORMAT_R16G16_UNORM; - case __DRI_IMAGE_FORMAT_SARGB8: - return MESA_FORMAT_B8G8R8A8_SRGB; - case __DRI_IMAGE_FORMAT_NONE: - return MESA_FORMAT_NONE; - default: - return MESA_FORMAT_NONE; - } + for (size_t i = 0; i < ARRAY_SIZE(format_mapping); i++) + if (format_mapping[i].image_format == image_format) + return format_mapping[i].mesa_format; + + return MESA_FORMAT_NONE; } /** Image driver interface */