X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fglx%2Fdri_common.c;h=8bf47054a3259beb89e1b7d5a0f534a6deeb5142;hb=002a3a74273b81dfb226e1c3f0a8c18525ed0af4;hp=83d6e3c31082ca22420e58468be3535ce268bb66;hpb=1218430e1200a08cd64b6555d3fd1fd0274ad9e5;p=mesa.git diff --git a/src/glx/dri_common.c b/src/glx/dri_common.c index 83d6e3c3108..8bf47054a32 100644 --- a/src/glx/dri_common.c +++ b/src/glx/dri_common.c @@ -40,6 +40,7 @@ #include #include "glxclient.h" #include "dri_common.h" +#include "loader.h" #ifndef RTLD_NOW #define RTLD_NOW 0 @@ -49,30 +50,23 @@ #endif _X_HIDDEN void -InfoMessageF(const char *f, ...) +dri_message(int level, const char *f, ...) { va_list args; - const char *env; - - if ((env = getenv("LIBGL_DEBUG")) && strstr(env, "verbose")) { - fprintf(stderr, "libGL: "); - va_start(args, f); - vfprintf(stderr, f, args); - va_end(args); + int threshold = _LOADER_WARNING; + const char *libgl_debug; + + libgl_debug = getenv("LIBGL_DEBUG"); + if (libgl_debug) { + if (strstr(libgl_debug, "quiet")) + threshold = _LOADER_FATAL; + else if (strstr(libgl_debug, "verbose")) + threshold = _LOADER_DEBUG; } -} - -/** - * Print error to stderr, unless LIBGL_DEBUG=="quiet". - */ -_X_HIDDEN void -ErrorMessageF(const char *f, ...) -{ - va_list args; - const char *env; - if ((env = getenv("LIBGL_DEBUG")) && !strstr(env, "quiet")) { - fprintf(stderr, "libGL error: "); + /* Note that the _LOADER_* levels are lower numbers for more severe. */ + if (level <= threshold) { + fprintf(stderr, "libGL%s: ", level <= _LOADER_WARNING ? " error" : ""); va_start(args, f); vfprintf(stderr, f, args); va_end(args); @@ -91,7 +85,7 @@ ErrorMessageF(const char *f, ...) * directories specified by the \c LIBGL_DRIVERS_PATH environment variable in * order to find the driver. * - * \param driverName - a name like "tdfx", "i810", "mga", etc. + * \param driverName - a name like "i965", "radeon", "nouveau", etc. * * \returns * A handle from \c dlopen, or \c NULL if driver file not found. @@ -158,6 +152,35 @@ driOpenDriver(const char *driverName) return handle; } +_X_HIDDEN const __DRIextension ** +driGetDriverExtensions(void *handle, const char *driver_name) +{ + const __DRIextension **extensions = NULL; + const __DRIextension **(*get_extensions)(void); + char *get_extensions_name; + + if (asprintf(&get_extensions_name, "%s_%s", + __DRI_DRIVER_GET_EXTENSIONS, driver_name) != -1) { + get_extensions = dlsym(handle, get_extensions_name); + if (get_extensions) { + free(get_extensions_name); + return get_extensions(); + } else { + InfoMessageF("driver does not expose %s(): %s\n", + get_extensions_name, dlerror()); + free(get_extensions_name); + } + } + + extensions = dlsym(handle, __DRI_DRIVER_EXTENSIONS); + if (extensions == NULL) { + ErrorMessageF("driver exports no extensions (%s)\n", dlerror()); + return NULL; + } + + return extensions; +} + static GLboolean __driGetMSCRate(__DRIdrawable *draw, int32_t * numerator, int32_t * denominator, @@ -165,13 +188,14 @@ __driGetMSCRate(__DRIdrawable *draw, { __GLXDRIdrawable *glxDraw = loaderPrivate; - return __glxGetMscRate(glxDraw, numerator, denominator); + return __glxGetMscRate(glxDraw->psc, numerator, denominator); } _X_HIDDEN const __DRIsystemTimeExtension systemTimeExtension = { - {__DRI_SYSTEM_TIME, __DRI_SYSTEM_TIME_VERSION}, - __glXGetUST, - __driGetMSCRate + .base = {__DRI_SYSTEM_TIME, 1 }, + + .getUST = __glXGetUST, + .getMSCRate = __driGetMSCRate }; #define __ATTRIB(attrib, field) \ @@ -222,7 +246,9 @@ __ATTRIB(__DRI_ATTRIB_BIND_TO_TEXTURE_RGB, bindToTextureRgb), __ATTRIB(__DRI_ATTRIB_BIND_TO_TEXTURE_RGBA, bindToTextureRgba), __ATTRIB(__DRI_ATTRIB_BIND_TO_MIPMAP_TEXTURE, bindToMipmapTexture), - __ATTRIB(__DRI_ATTRIB_YINVERTED, yInverted),}; + __ATTRIB(__DRI_ATTRIB_YINVERTED, yInverted), + __ATTRIB(__DRI_ATTRIB_FRAMEBUFFER_SRGB_CAPABLE, sRGBCapable) +}; static int scalarEqual(struct glx_config *mode, unsigned int attrib, unsigned int value) @@ -254,9 +280,15 @@ driConfigEqual(const __DRIcoreExtension *core, if (value & __DRI_ATTRIB_RGBA_BIT) { glxValue |= GLX_RGBA_BIT; } - else if (value & __DRI_ATTRIB_COLOR_INDEX_BIT) { + if (value & __DRI_ATTRIB_COLOR_INDEX_BIT) { glxValue |= GLX_COLOR_INDEX_BIT; } + if (value & __DRI_ATTRIB_FLOAT_BIT) { + glxValue |= GLX_RGBA_FLOAT_BIT_ARB; + } + if (value & __DRI_ATTRIB_UNSIGNED_FLOAT_BIT) { + glxValue |= GLX_RGBA_UNSIGNED_FLOAT_BIT_EXT; + } if (glxValue != config->renderType) return GL_FALSE; break; @@ -309,7 +341,7 @@ createDriMode(const __DRIcoreExtension * core, if (driConfigs[i] == NULL) return NULL; - driConfig = Xmalloc(sizeof *driConfig); + driConfig = malloc(sizeof *driConfig); if (driConfig == NULL) return NULL; @@ -338,8 +370,6 @@ driConvertConfigs(const __DRIcoreExtension * core, tail = tail->next; } - glx_config_destroy_list(configs); - return head.next; } @@ -363,19 +393,31 @@ driFetchDrawable(struct glx_context *gc, GLXDrawable glxDrawable) if (priv == NULL) return NULL; + if (glxDrawable == None) + return NULL; + psc = priv->screens[gc->screen]; if (priv->drawHash == NULL) return NULL; - if (__glxHashLookup(priv->drawHash, glxDrawable, (void *) &pdraw) == 0) + if (__glxHashLookup(priv->drawHash, glxDrawable, (void *) &pdraw) == 0) { + pdraw->refcount ++; return pdraw; + } pdraw = psc->driScreen->createDrawable(psc, glxDrawable, glxDrawable, gc->config); + + if (pdraw == NULL) { + ErrorMessageF("failed to create drawable\n"); + return NULL; + } + if (__glxHashInsert(priv->drawHash, glxDrawable, pdraw)) { (*pdraw->destroyDrawable) (pdraw); return NULL; } + pdraw->refcount = 1; return pdraw; } @@ -383,7 +425,7 @@ driFetchDrawable(struct glx_context *gc, GLXDrawable glxDrawable) _X_HIDDEN void driReleaseDrawables(struct glx_context *gc) { - struct glx_display *const priv = __glXInitialize(gc->psc->dpy); + const struct glx_display *priv = gc->psc->display; __GLXDRIdrawable *pdraw; if (priv == NULL) @@ -392,19 +434,164 @@ driReleaseDrawables(struct glx_context *gc) if (__glxHashLookup(priv->drawHash, gc->currentDrawable, (void *) &pdraw) == 0) { if (pdraw->drawable == pdraw->xDrawable) { - (*pdraw->destroyDrawable)(pdraw); - __glxHashDelete(priv->drawHash, gc->currentDrawable); + pdraw->refcount --; + if (pdraw->refcount == 0) { + (*pdraw->destroyDrawable)(pdraw); + __glxHashDelete(priv->drawHash, gc->currentDrawable); + } } } - if (gc->currentDrawable != gc->currentReadable && - __glxHashLookup(priv->drawHash, + if (__glxHashLookup(priv->drawHash, gc->currentReadable, (void *) &pdraw) == 0) { if (pdraw->drawable == pdraw->xDrawable) { - (*pdraw->destroyDrawable)(pdraw); - __glxHashDelete(priv->drawHash, gc->currentReadable); + pdraw->refcount --; + if (pdraw->refcount == 0) { + (*pdraw->destroyDrawable)(pdraw); + __glxHashDelete(priv->drawHash, gc->currentReadable); + } + } + } + + gc->currentDrawable = None; + gc->currentReadable = None; + +} + +_X_HIDDEN bool +dri2_convert_glx_attribs(unsigned num_attribs, const uint32_t *attribs, + unsigned *major_ver, unsigned *minor_ver, + uint32_t *render_type, uint32_t *flags, unsigned *api, + int *reset, unsigned *error) +{ + unsigned i; + bool got_profile = false; + uint32_t profile; + + *major_ver = 1; + *minor_ver = 0; + *render_type = GLX_RGBA_TYPE; + *reset = __DRI_CTX_RESET_NO_NOTIFICATION; + *flags = 0; + *api = __DRI_API_OPENGL; + + if (num_attribs == 0) { + return true; + } + + /* This is actually an internal error, but what the heck. + */ + if (attribs == NULL) { + *error = __DRI_CTX_ERROR_UNKNOWN_ATTRIBUTE; + return false; + } + + for (i = 0; i < num_attribs; i++) { + switch (attribs[i * 2]) { + case GLX_CONTEXT_MAJOR_VERSION_ARB: + *major_ver = attribs[i * 2 + 1]; + break; + case GLX_CONTEXT_MINOR_VERSION_ARB: + *minor_ver = attribs[i * 2 + 1]; + break; + case GLX_CONTEXT_FLAGS_ARB: + *flags = attribs[i * 2 + 1]; + break; + case GLX_CONTEXT_PROFILE_MASK_ARB: + profile = attribs[i * 2 + 1]; + got_profile = true; + break; + case GLX_RENDER_TYPE: + *render_type = attribs[i * 2 + 1]; + break; + case GLX_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB: + switch (attribs[i * 2 + 1]) { + case GLX_NO_RESET_NOTIFICATION_ARB: + *reset = __DRI_CTX_RESET_NO_NOTIFICATION; + break; + case GLX_LOSE_CONTEXT_ON_RESET_ARB: + *reset = __DRI_CTX_RESET_LOSE_CONTEXT; + break; + default: + *error = __DRI_CTX_ERROR_UNKNOWN_ATTRIBUTE; + return false; + } + break; + default: + /* If an unknown attribute is received, fail. + */ + *error = __DRI_CTX_ERROR_UNKNOWN_ATTRIBUTE; + return false; + } + } + + if (!got_profile) { + if (*major_ver > 3 || (*major_ver == 3 && *minor_ver >= 2)) + *api = __DRI_API_OPENGL_CORE; + } else { + switch (profile) { + case GLX_CONTEXT_CORE_PROFILE_BIT_ARB: + /* There are no profiles before OpenGL 3.2. The + * GLX_ARB_create_context_profile spec says: + * + * "If the requested OpenGL version is less than 3.2, + * GLX_CONTEXT_PROFILE_MASK_ARB is ignored and the functionality + * of the context is determined solely by the requested version." + */ + *api = (*major_ver > 3 || (*major_ver == 3 && *minor_ver >= 2)) + ? __DRI_API_OPENGL_CORE : __DRI_API_OPENGL; + break; + case GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB: + *api = __DRI_API_OPENGL; + break; + case GLX_CONTEXT_ES2_PROFILE_BIT_EXT: + *api = __DRI_API_GLES2; + break; + default: + *error = __DRI_CTX_ERROR_BAD_API; + return false; } } + + /* Unknown flag value. + */ + if (*flags & ~(__DRI_CTX_FLAG_DEBUG | __DRI_CTX_FLAG_FORWARD_COMPATIBLE + | __DRI_CTX_FLAG_ROBUST_BUFFER_ACCESS)) { + *error = __DRI_CTX_ERROR_UNKNOWN_FLAG; + return false; + } + + /* There are no forward-compatible contexts before OpenGL 3.0. The + * GLX_ARB_create_context spec says: + * + * "Forward-compatible contexts are defined only for OpenGL versions + * 3.0 and later." + */ + if (*major_ver < 3 && (*flags & __DRI_CTX_FLAG_FORWARD_COMPATIBLE) != 0) { + *error = __DRI_CTX_ERROR_BAD_FLAG; + return false; + } + + if (*major_ver >= 3 && *render_type == GLX_COLOR_INDEX_TYPE) { + *error = __DRI_CTX_ERROR_BAD_FLAG; + return false; + } + + /* The GLX_EXT_create_context_es2_profile spec says: + * + * "... If the version requested is 2.0, and the + * GLX_CONTEXT_ES2_PROFILE_BIT_EXT bit is set in the + * GLX_CONTEXT_PROFILE_MASK_ARB attribute (see below), then the context + * returned will implement OpenGL ES 2.0. This is the only way in which + * an implementation may request an OpenGL ES 2.0 context." + */ + if (*api == __DRI_API_GLES2 && (*major_ver != 2 || *minor_ver != 0)) { + *error = __DRI_CTX_ERROR_BAD_API; + return false; + } + + *error = __DRI_CTX_ERROR_SUCCESS; + return true; } #endif /* GLX_DIRECT_RENDERING */