430bc16ca0
If we are using MESA as our GL library, then both xserver's
GLX and glamor are link to the same library. As xserver's
GLX has its own _glapi_get/set_context/dispatch etc, and it
is a simplified version derived from mesa thus is not
sufficient for mesa/egl's dri loader which is used by glamor.
Then if glx module is loaded before glamoregl module, the
initialization of mesa/egl/opengl will not be correct, and
will fail at a very early stage, most likely fail to map
the element buffer.
Two methodis to fix this problem, first is to modify the xserver's
glx's glapi.c to fit mesa's requirement. The second is to put
a glamor.conf as below, to the system's xorg.conf path.
Section "Module"
Load "glamoregl"
EndSection
Then glamor will be loaded firstly, and the mesa's libglapi.so
will be used. As current xserver's dispatch table is the same
as mesa's, then the glx's dri loader can work without problem.
We took the second method as it don't need any change to xorg.:)
Although this is not a graceful implementation as it depends
on the xserver's dispatch table and the mesa's dispatch table
is the same and the context set and get is using the same method.
Anyway it works.
As by default, xserver will enable GLX_USE_TLS. But mesa will not
enable it, you may need to enable that when build mesa.
Three pre-requirements to make this glamor version work:
0. Make sure xserver has commit 66e603, if not please pull the latest
master branch.
1. Rebuild mesa by enable GLX_USE_TLS.
2. Put the glamor.conf to your system's xorg.conf path and make sure
it loaded prior to glx module.
Preliminary testing shows indirect glxgears works fine.
If user want to use GLES2 for glamor by using MESA, GLX will not
work correctly.
If you are not using normal MESA, for example PVR's private GLES
implementation, then it should be ok to use GLES2 glamor and the
GLX should work as expected. In this commit, I use gbm to check
whether we are using MESA or non-mesa. Maybe not the best way.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
161 lines
5.1 KiB
C
161 lines
5.1 KiB
C
/*
|
|
* Copyright © 2009 Intel Corporation
|
|
* Copyright © 1998 Keith Packard
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice (including the next
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
* Software.
|
|
*
|
|
* 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
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS 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.
|
|
*
|
|
* Authors:
|
|
* Zhigang Gong <zhigang.gong@gmail.com>
|
|
*
|
|
*/
|
|
|
|
#ifdef HAVE_DIX_CONFIG_H
|
|
#include <dix-config.h>
|
|
#endif
|
|
|
|
#include "glamor_priv.h"
|
|
|
|
static Bool
|
|
_glamor_image_glyph_blt(DrawablePtr pDrawable, GCPtr pGC,
|
|
int x, int y, unsigned int nglyph,
|
|
CharInfoPtr * ppci, pointer pglyphBase, Bool fallback)
|
|
{
|
|
GLAMOR_DEFINE_CONTEXT;
|
|
glamor_screen_private *glamor_priv;
|
|
|
|
if (!fallback
|
|
&& glamor_ddx_fallback_check_pixmap(pDrawable)
|
|
&& glamor_ddx_fallback_check_gc(pGC))
|
|
goto fail;
|
|
|
|
glamor_priv = glamor_get_screen_private(pDrawable->pScreen);
|
|
GLAMOR_SET_CONTEXT(glamor_priv);
|
|
glamor_prepare_access(pDrawable, GLAMOR_ACCESS_RW);
|
|
glamor_prepare_access_gc(pGC);
|
|
fbImageGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase);
|
|
glamor_finish_access_gc(pGC);
|
|
glamor_finish_access(pDrawable, GLAMOR_ACCESS_RW);
|
|
GLAMOR_RESTORE_CONTEXT(glamor_priv);
|
|
return TRUE;
|
|
fail:
|
|
return FALSE;
|
|
}
|
|
|
|
void
|
|
glamor_image_glyph_blt(DrawablePtr pDrawable, GCPtr pGC,
|
|
int x, int y, unsigned int nglyph,
|
|
CharInfoPtr * ppci, pointer pglyphBase)
|
|
{
|
|
_glamor_image_glyph_blt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase, TRUE);
|
|
}
|
|
|
|
Bool
|
|
glamor_image_glyph_blt_nf(DrawablePtr pDrawable, GCPtr pGC,
|
|
int x, int y, unsigned int nglyph,
|
|
CharInfoPtr * ppci, pointer pglyphBase)
|
|
{
|
|
return _glamor_image_glyph_blt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase, FALSE);
|
|
}
|
|
|
|
static Bool
|
|
_glamor_poly_glyph_blt(DrawablePtr pDrawable, GCPtr pGC,
|
|
int x, int y, unsigned int nglyph,
|
|
CharInfoPtr * ppci, pointer pglyphBase, Bool fallback)
|
|
{
|
|
GLAMOR_DEFINE_CONTEXT;
|
|
glamor_screen_private *glamor_priv;
|
|
|
|
if (!fallback
|
|
&& glamor_ddx_fallback_check_pixmap(pDrawable)
|
|
&& glamor_ddx_fallback_check_gc(pGC))
|
|
goto fail;
|
|
|
|
glamor_priv = glamor_get_screen_private(pDrawable->pScreen);
|
|
GLAMOR_SET_CONTEXT(glamor_priv);
|
|
glamor_prepare_access(pDrawable, GLAMOR_ACCESS_RW);
|
|
glamor_prepare_access_gc(pGC);
|
|
fbPolyGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase);
|
|
glamor_finish_access_gc(pGC);
|
|
glamor_finish_access(pDrawable, GLAMOR_ACCESS_RW);
|
|
GLAMOR_RESTORE_CONTEXT(glamor_priv);
|
|
return TRUE;
|
|
fail:
|
|
return FALSE;
|
|
}
|
|
|
|
void
|
|
glamor_poly_glyph_blt(DrawablePtr pDrawable, GCPtr pGC,
|
|
int x, int y, unsigned int nglyph,
|
|
CharInfoPtr * ppci, pointer pglyphBase)
|
|
{
|
|
_glamor_poly_glyph_blt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase, TRUE);
|
|
}
|
|
|
|
Bool
|
|
glamor_poly_glyph_blt_nf(DrawablePtr pDrawable, GCPtr pGC,
|
|
int x, int y, unsigned int nglyph,
|
|
CharInfoPtr * ppci, pointer pglyphBase)
|
|
{
|
|
return _glamor_poly_glyph_blt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase, FALSE);
|
|
}
|
|
|
|
static Bool
|
|
_glamor_push_pixels(GCPtr pGC, PixmapPtr pBitmap,
|
|
DrawablePtr pDrawable, int w, int h, int x, int y, Bool fallback)
|
|
{
|
|
GLAMOR_DEFINE_CONTEXT;
|
|
glamor_screen_private *glamor_priv;
|
|
|
|
if (!fallback
|
|
&& glamor_ddx_fallback_check_pixmap(pDrawable)
|
|
&& glamor_ddx_fallback_check_pixmap(&pBitmap->drawable)
|
|
&& glamor_ddx_fallback_check_gc(pGC))
|
|
goto fail;
|
|
|
|
glamor_priv = glamor_get_screen_private(pDrawable->pScreen);
|
|
GLAMOR_SET_CONTEXT(glamor_priv);
|
|
glamor_prepare_access(pDrawable, GLAMOR_ACCESS_RW);
|
|
glamor_prepare_access(&pBitmap->drawable, GLAMOR_ACCESS_RO);
|
|
glamor_prepare_access_gc(pGC);
|
|
fbPushPixels(pGC, pBitmap, pDrawable, w, h, x, y);
|
|
glamor_finish_access_gc(pGC);
|
|
glamor_finish_access(&pBitmap->drawable, GLAMOR_ACCESS_RO);
|
|
glamor_finish_access(pDrawable, GLAMOR_ACCESS_RW);
|
|
GLAMOR_RESTORE_CONTEXT(glamor_priv);
|
|
return TRUE;
|
|
fail:
|
|
return FALSE;
|
|
}
|
|
|
|
void
|
|
glamor_push_pixels(GCPtr pGC, PixmapPtr pBitmap,
|
|
DrawablePtr pDrawable, int w, int h, int x, int y)
|
|
{
|
|
_glamor_push_pixels(pGC, pBitmap, pDrawable, w, h, x, y, TRUE);
|
|
}
|
|
|
|
Bool
|
|
glamor_push_pixels_nf(GCPtr pGC, PixmapPtr pBitmap,
|
|
DrawablePtr pDrawable, int w, int h, int x, int y)
|
|
{
|
|
return _glamor_push_pixels(pGC, pBitmap, pDrawable, w, h, x, y, FALSE);
|
|
}
|
|
|