X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fstate_trackers%2Fglx%2Fxlib%2Fxm_api.c;h=fff546732c17136af418f1cabea4a05f96b15e1c;hb=dd404bc94f78a1766527becee03f8ef6ae3a799b;hp=fc12a9a71f67744d0bd32ab996ce150a21e80cb6;hpb=83adf8c3a4fd75b7877e1894f6f32a04a4d0bf06;p=mesa.git diff --git a/src/gallium/state_trackers/glx/xlib/xm_api.c b/src/gallium/state_trackers/glx/xlib/xm_api.c index fc12a9a71f6..fff546732c1 100644 --- a/src/gallium/state_trackers/glx/xlib/xm_api.c +++ b/src/gallium/state_trackers/glx/xlib/xm_api.c @@ -17,7 +17,7 @@ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ @@ -56,10 +56,15 @@ #include "xm_api.h" #include "xm_st.h" -#include "main/context.h" +#include "pipe/p_context.h" #include "pipe/p_defines.h" #include "pipe/p_screen.h" -#include "pipe/p_context.h" +#include "pipe/p_state.h" + +#include "util/u_atomic.h" +#include "util/u_inlines.h" + +#include "hud/hud_context.h" #include "xm_public.h" #include @@ -72,10 +77,35 @@ static struct xm_driver driver; static struct st_api *stapi; +/* Default strict invalidate to false. This means we will not call + * XGetGeometry after every swapbuffers, which allows swapbuffers to + * remain asynchronous. For apps running at 100fps with synchronous + * swapping, a 10% boost is typical. For gears, I see closer to 20% + * speedup. + * + * Note that the work of copying data on swapbuffers doesn't disappear + * - this change just allows the X server to execute the PutImage + * asynchronously without us effectively blocked until its completion. + * + * This speeds up even llvmpipe's threaded rasterization as the + * swapbuffers operation was a large part of the serial component of + * an llvmpipe frame. + * + * The downside of this is correctness - applications which don't call + * glViewport on window resizes will get incorrect rendering. A + * better solution would be to have per-frame but asynchronous + * invalidation. Xcb almost looks as if it could provide this, but + * the API doesn't seem to quite be there. + */ +boolean xmesa_strict_invalidate = FALSE; + void xmesa_set_driver( const struct xm_driver *templ ) { driver = *templ; stapi = driver.create_st_api(); + + xmesa_strict_invalidate = + debug_get_bool_option("XMESA_STRICT_INVALIDATE", FALSE); } @@ -91,7 +121,12 @@ static int xmesa_get_param(struct st_manager *smapi, enum st_manager_param param) { - return 0; + switch(param) { + case ST_MANAGER_BROKEN_INVALIDATE: + return !xmesa_strict_invalidate; + default: + return 0; + } } static XMesaDisplay @@ -135,10 +170,8 @@ xmesa_init_display( Display *display ) xmdpy->screen->destroy(xmdpy->screen); xmdpy->screen = NULL; } - if (xmdpy->smapi) { - FREE(xmdpy->smapi); - xmdpy->smapi = NULL; - } + free(xmdpy->smapi); + xmdpy->smapi = NULL; xmdpy->display = NULL; } @@ -187,7 +220,7 @@ bits_per_pixel( XMesaVisual xmv ) /* Create a temporary XImage */ img = XCreateImage( dpy, visinfo->visual, visinfo->depth, ZPixmap, 0, /*format, offset*/ - (char*) MALLOC(8), /*data*/ + malloc(8), /*data*/ 1, 1, /*width, height*/ 32, /*bitmap_pad*/ 0 /*bytes_per_line*/ @@ -263,7 +296,6 @@ xmesa_get_window_size(Display *dpy, XMesaBuffer b, Status stat; pipe_mutex_lock(xmdpy->mutex); - XSync(b->xm_visual->display, 0); /* added for Chromium */ stat = get_drawable_size(dpy, b->ws.drawable, width, height); pipe_mutex_unlock(xmdpy->mutex); @@ -348,8 +380,6 @@ choose_depth_stencil_format(XMesaDisplay xmdpy, int depth, int stencil) { const enum pipe_texture_target target = PIPE_TEXTURE_2D; const unsigned tex_usage = PIPE_BIND_DEPTH_STENCIL; - const unsigned geom_flags = (PIPE_TEXTURE_GEOM_NON_SQUARE | - PIPE_TEXTURE_GEOM_NON_POWER_OF_TWO); const unsigned sample_count = 0; enum pipe_format formats[8], fmt; int count, i; @@ -364,8 +394,8 @@ choose_depth_stencil_format(XMesaDisplay xmdpy, int depth, int stencil) formats[count++] = PIPE_FORMAT_Z24X8_UNORM; } if (depth <= 24 && stencil <= 8) { - formats[count++] = PIPE_FORMAT_S8_USCALED_Z24_UNORM; - formats[count++] = PIPE_FORMAT_Z24_UNORM_S8_USCALED; + formats[count++] = PIPE_FORMAT_S8_UINT_Z24_UNORM; + formats[count++] = PIPE_FORMAT_Z24_UNORM_S8_UINT; } if (depth <= 32 && stencil == 0) { formats[count++] = PIPE_FORMAT_Z32_UNORM; @@ -375,7 +405,7 @@ choose_depth_stencil_format(XMesaDisplay xmdpy, int depth, int stencil) for (i = 0; i < count; i++) { if (xmdpy->screen->is_format_supported(xmdpy->screen, formats[i], target, sample_count, - tex_usage, geom_flags)) { + tex_usage)) { fmt = formats[i]; break; } @@ -395,7 +425,7 @@ static XMesaBuffer XMesaBufferList = NULL; /** * Allocate a new XMesaBuffer object which corresponds to the given drawable. - * Note that XMesaBuffer is derived from GLframebuffer. + * Note that XMesaBuffer is derived from struct gl_framebuffer. * The new XMesaBuffer will not have any size (Width=Height=0). * * \param d the corresponding X drawable (window or pixmap) @@ -410,7 +440,6 @@ create_xmesa_buffer(Drawable d, BufferType type, { XMesaDisplay xmdpy = xmesa_init_display(vis->display); XMesaBuffer b; - uint width, height; ASSERT(type == WINDOW || type == PIXMAP || type == PBUFFER); @@ -429,7 +458,7 @@ create_xmesa_buffer(Drawable d, BufferType type, b->type = type; b->cmap = cmap; - get_drawable_size(vis->display, d, &width, &height); + get_drawable_size(vis->display, d, &b->width, &b->height); /* * Create framebuffer, but we'll plug in our own renderbuffers below. @@ -541,7 +570,7 @@ initialize_visual_and_buffer(XMesaVisual v, XMesaBuffer b, /* RGB WINDOW: * We support RGB rendering into almost any kind of visual. */ - const int xclass = v->mesa_visual.visualType; + const int xclass = v->visualType; if (xclass != GLX_TRUE_COLOR && xclass == !GLX_DIRECT_COLOR) { _mesa_warning(NULL, "XMesa: RGB mode rendering not supported in given visual.\n"); @@ -676,7 +705,7 @@ XMesaVisual XMesaCreateVisual( Display *display, * the struct but we may need some of the information contained in it * at a later time. */ - v->visinfo = (XVisualInfo *) MALLOC(sizeof(*visinfo)); + v->visinfo = (XVisualInfo *) malloc(sizeof(*visinfo)); if (!v->visinfo) { free(v); return NULL; @@ -688,13 +717,13 @@ XMesaVisual XMesaCreateVisual( Display *display, v->mesa_visual.redMask = visinfo->red_mask; v->mesa_visual.greenMask = visinfo->green_mask; v->mesa_visual.blueMask = visinfo->blue_mask; - v->mesa_visual.visualID = visinfo->visualid; - v->mesa_visual.screen = visinfo->screen; + v->visualID = visinfo->visualid; + v->screen = visinfo->screen; #if !(defined(__cplusplus) || defined(c_plusplus)) - v->mesa_visual.visualType = xmesa_convert_from_x_visual_type(visinfo->class); + v->visualType = xmesa_convert_from_x_visual_type(visinfo->class); #else - v->mesa_visual.visualType = xmesa_convert_from_x_visual_type(visinfo->c_class); + v->visualType = xmesa_convert_from_x_visual_type(visinfo->c_class); #endif v->mesa_visual.visualRating = visualCaveat; @@ -705,7 +734,7 @@ XMesaVisual XMesaCreateVisual( Display *display, (void) initialize_visual_and_buffer( v, NULL, rgb_flag, 0, 0 ); { - const int xclass = v->mesa_visual.visualType; + const int xclass = v->visualType; if (xclass == GLX_TRUE_COLOR || xclass == GLX_DIRECT_COLOR) { red_bits = _mesa_bitcount(GET_REDMASK(v)); green_bits = _mesa_bitcount(GET_GREENMASK(v)); @@ -726,15 +755,38 @@ XMesaVisual XMesaCreateVisual( Display *display, alpha_bits = v->mesa_visual.alphaBits; } - _mesa_initialize_visual( &v->mesa_visual, - db_flag, stereo_flag, - red_bits, green_bits, - blue_bits, alpha_bits, - depth_size, - stencil_size, - accum_red_size, accum_green_size, - accum_blue_size, accum_alpha_size, - 0 ); + /* initialize visual */ + { + struct gl_config *vis = &v->mesa_visual; + + vis->rgbMode = GL_TRUE; + vis->doubleBufferMode = db_flag; + vis->stereoMode = stereo_flag; + + vis->redBits = red_bits; + vis->greenBits = green_bits; + vis->blueBits = blue_bits; + vis->alphaBits = alpha_bits; + vis->rgbBits = red_bits + green_bits + blue_bits; + + vis->indexBits = 0; + vis->depthBits = depth_size; + vis->stencilBits = stencil_size; + + vis->accumRedBits = accum_red_size; + vis->accumGreenBits = accum_green_size; + vis->accumBlueBits = accum_blue_size; + vis->accumAlphaBits = accum_alpha_size; + + vis->haveAccumBuffer = accum_red_size > 0; + vis->haveDepthBuffer = depth_size > 0; + vis->haveStencilBuffer = stencil_size > 0; + + vis->numAuxBuffers = 0; + vis->level = 0; + vis->sampleBuffers = 0; + vis->samples = 0; + } v->stvis.buffer_mask = ST_ATTACHMENT_FRONT_LEFT_MASK; if (db_flag) @@ -747,8 +799,8 @@ XMesaVisual XMesaCreateVisual( Display *display, v->stvis.color_format = choose_pixel_format(v); if (v->stvis.color_format == PIPE_FORMAT_NONE) { - FREE(v->visinfo); - FREE(v); + free(v->visinfo); + free(v); return NULL; } @@ -776,6 +828,16 @@ void XMesaDestroyVisual( XMesaVisual v ) } +/** + * Return the informative name. + */ +const char * +xmesa_get_name(void) +{ + return stapi->name; +} + + /** * Do per-display initializations. */ @@ -794,15 +856,19 @@ xmesa_init( Display *display ) * \return an XMesaContext or NULL if error. */ PUBLIC -XMesaContext XMesaCreateContext( XMesaVisual v, XMesaContext share_list ) +XMesaContext XMesaCreateContext( XMesaVisual v, XMesaContext share_list, + GLuint major, GLuint minor, + GLuint profileMask, GLuint contextFlags) { XMesaDisplay xmdpy = xmesa_init_display(v->display); + struct st_context_attribs attribs; + enum st_context_error ctx_err = 0; XMesaContext c; if (!xmdpy) return NULL; - /* Note: the XMesaContext contains a Mesa GLcontext struct (inheritance) */ + /* Note: the XMesaContext contains a Mesa struct gl_context struct (inheritance) */ c = (XMesaContext) CALLOC_STRUCT(xmesa_context); if (!c) return NULL; @@ -811,13 +877,43 @@ XMesaContext XMesaCreateContext( XMesaVisual v, XMesaContext share_list ) c->xm_buffer = NULL; /* set later by XMesaMakeCurrent */ c->xm_read_buffer = NULL; - c->st = stapi->create_context(stapi, xmdpy->smapi, - &v->stvis, (share_list) ? share_list->st : NULL); + memset(&attribs, 0, sizeof(attribs)); + attribs.visual = v->stvis; + attribs.major = major; + attribs.minor = minor; + if (contextFlags & GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB) + attribs.flags |= ST_CONTEXT_FLAG_FORWARD_COMPATIBLE; + if (contextFlags & GLX_CONTEXT_DEBUG_BIT_ARB) + attribs.flags |= ST_CONTEXT_FLAG_DEBUG; + if (contextFlags & GLX_CONTEXT_ROBUST_ACCESS_BIT_ARB) + attribs.flags |= ST_CONTEXT_FLAG_ROBUST_ACCESS; + + /* 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." + * + * The spec also says: + * + * "The default value for GLX_CONTEXT_PROFILE_MASK_ARB is + * GLX_CONTEXT_CORE_PROFILE_BIT_ARB." + */ + attribs.profile = ST_PROFILE_DEFAULT; + if ((major > 3 || (major == 3 && minor >= 2)) + && ((profileMask & GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB) == 0)) + attribs.profile = ST_PROFILE_OPENGL_CORE; + + c->st = stapi->create_context(stapi, xmdpy->smapi, &attribs, + &ctx_err, (share_list) ? share_list->st : NULL); if (c->st == NULL) goto fail; c->st->st_manager_private = (void *) c; + c->hud = hud_create(c->st->pipe, c->st->cso_context); + return c; fail: @@ -833,6 +929,10 @@ fail: PUBLIC void XMesaDestroyContext( XMesaContext c ) { + if (c->hud) { + hud_destroy(c->hud); + } + c->st->destroy(c->st); /* FIXME: We should destroy the screen here, but if we do so, surfaces may @@ -1029,20 +1129,34 @@ XMesaDestroyBuffer(XMesaBuffer b) } +/** + * Notify the binding context to validate the buffer. + */ +void +xmesa_notify_invalid_buffer(XMesaBuffer b) +{ + p_atomic_inc(&b->stfb->stamp); +} + + /** * Query the current drawable size and notify the binding context. */ void xmesa_check_buffer_size(XMesaBuffer b) { - XMesaContext xmctx = XMesaGetCurrentContext(); + GLuint old_width, old_height; if (b->type == PBUFFER) return; + old_width = b->width; + old_height = b->height; + xmesa_get_window_size(b->xm_visual->display, b, &b->width, &b->height); - if (xmctx && xmctx->xm_buffer == b) - xmctx->st->notify_invalid_framebuffer(xmctx->st, b->stfb); + + if (b->width != old_width || b->height != old_height) + xmesa_notify_invalid_buffer(b); } @@ -1118,12 +1232,15 @@ void XMesaSwapBuffers( XMesaBuffer b ) { XMesaContext xmctx = XMesaGetCurrentContext(); + /* Need to draw HUD before flushing */ + if (xmctx && xmctx->hud) { + struct pipe_resource *back = + xmesa_get_framebuffer_resource(b->stfb, ST_ATTACHMENT_BACK_LEFT); + hud_draw(xmctx->hud, back); + } + if (xmctx && xmctx->xm_buffer == b) { - xmctx->st->flush( xmctx->st, - PIPE_FLUSH_RENDER_CACHE | - PIPE_FLUSH_SWAPBUFFERS | - PIPE_FLUSH_FRAME, - NULL); + xmctx->st->flush( xmctx->st, ST_FLUSH_FRONT, NULL); } xmesa_swap_st_framebuffer(b->stfb); @@ -1149,12 +1266,13 @@ void XMesaFlush( XMesaContext c ) XMesaDisplay xmdpy = xmesa_init_display(c->xm_visual->display); struct pipe_fence_handle *fence = NULL; - c->st->flush(c->st, PIPE_FLUSH_RENDER_CACHE | PIPE_FLUSH_FRAME, &fence); + c->st->flush(c->st, ST_FLUSH_FRONT, &fence); if (fence) { - xmdpy->screen->fence_finish(xmdpy->screen, fence, 0); + xmdpy->screen->fence_finish(xmdpy->screen, fence, + PIPE_TIMEOUT_INFINITE); xmdpy->screen->fence_reference(xmdpy->screen, &fence, NULL); } - XSync( c->xm_visual->display, False ); + XFlush( c->xm_visual->display ); } } @@ -1184,6 +1302,10 @@ void xmesa_destroy_buffers_on_display(Display *dpy) next = b->Next; if (b->xm_visual->display == dpy) { xmesa_free_buffer(b); + /* delete head of list? */ + if (XMesaBufferList == b) { + XMesaBufferList = next; + } } } } @@ -1212,12 +1334,94 @@ void XMesaGarbageCollect( void ) } +static enum st_attachment_type xmesa_attachment_type(int glx_attachment) +{ + switch(glx_attachment) { + case GLX_FRONT_LEFT_EXT: + return ST_ATTACHMENT_FRONT_LEFT; + case GLX_FRONT_RIGHT_EXT: + return ST_ATTACHMENT_FRONT_RIGHT; + case GLX_BACK_LEFT_EXT: + return ST_ATTACHMENT_BACK_LEFT; + case GLX_BACK_RIGHT_EXT: + return ST_ATTACHMENT_BACK_RIGHT; + default: + assert(0); + return ST_ATTACHMENT_FRONT_LEFT; + } +} PUBLIC void XMesaBindTexImage(Display *dpy, XMesaBuffer drawable, int buffer, const int *attrib_list) { + struct st_context_iface *st = stapi->get_current(stapi); + struct st_framebuffer_iface* stfbi = drawable->stfb; + struct pipe_resource *res; + int x, y, w, h; + enum st_attachment_type st_attachment = xmesa_attachment_type(buffer); + + x = 0; + y = 0; + w = drawable->width; + h = drawable->height; + + /* We need to validate our attachments before using them, + * in case the texture doesn't exist yet. */ + xmesa_st_framebuffer_validate_textures(stfbi, w, h, 1 << st_attachment); + res = xmesa_get_attachment(stfbi, st_attachment); + + if (res) { + struct pipe_context* pipe = xmesa_get_context(stfbi); + enum pipe_format internal_format = res->format; + struct pipe_transfer *tex_xfer; + char *map; + int line, ximage_stride; + XImage *img; + + internal_format = choose_pixel_format(drawable->xm_visual); + + map = pipe_transfer_map(pipe, res, + 0, 0, /* level, layer */ + PIPE_TRANSFER_WRITE, + x, y, + w, h, &tex_xfer); + if (!map) + return; + + /* Grab the XImage that we want to turn into a texture. */ + img = XGetImage(dpy, + drawable->ws.drawable, + x, y, + w, h, + AllPlanes, + ZPixmap); + + if (!img) { + pipe_transfer_unmap(pipe, tex_xfer); + return; + } + + /* The pipe transfer has a pitch rounded up to the nearest 64 pixels. + We assume 32 bit pixels. */ + ximage_stride = w * 4; + + for (line = 0; line < h; line++) + memcpy(&map[line * tex_xfer->stride], + &img->data[line * ximage_stride], + ximage_stride); + + pipe_transfer_unmap(pipe, tex_xfer); + + st->teximage(st, + ST_TEXTURE_2D, + 0, /* level */ + internal_format, + res, + FALSE /* no mipmap */); + + } }