556adfa6b9
Renaming glamor_priv->dispatch and wrapping the access to the dispatch table with a function that also ensured the context was bound. dispatch = glamor_get_dispatch(glamor_priv); ... glamor_put_dispatch(glamor_priv); So that we catch all places where we attempt to call into GL withouta context. As an optimisation we can then do glamor_get_context(); glamor_put_context() around the rendering entry points to reduce the frequency of having to restore the old context. (Along with allowing the context to be recursively acquired and making the old context part of the glamor_egl state.) Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com> Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
81 lines
2.4 KiB
C
81 lines
2.4 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>
|
|
*
|
|
*/
|
|
|
|
#include "glamor_priv.h"
|
|
|
|
static Bool
|
|
_glamor_triangles(CARD8 op,
|
|
PicturePtr pSrc,
|
|
PicturePtr pDst,
|
|
PictFormatPtr maskFormat,
|
|
INT16 xSrc, INT16 ySrc, int ntris, xTriangle * tris, Bool fallback)
|
|
{
|
|
if (!fallback
|
|
&& glamor_ddx_fallback_check_pixmap(pDst->pDrawable)
|
|
&& (!pSrc->pDrawable
|
|
|| glamor_ddx_fallback_check_pixmap(pSrc->pDrawable)))
|
|
return FALSE;
|
|
|
|
if (glamor_prepare_access_picture(pDst, GLAMOR_ACCESS_RW)) {
|
|
if (glamor_prepare_access_picture(pSrc,
|
|
GLAMOR_ACCESS_RO)) {
|
|
|
|
fbTriangles(op, pSrc, pDst, maskFormat, xSrc,
|
|
ySrc, ntris, tris);
|
|
|
|
glamor_finish_access_picture(pSrc, GLAMOR_ACCESS_RO);
|
|
}
|
|
|
|
glamor_finish_access_picture(pDst, GLAMOR_ACCESS_RW);
|
|
}
|
|
return TRUE;
|
|
}
|
|
|
|
void
|
|
glamor_triangles(CARD8 op,
|
|
PicturePtr pSrc,
|
|
PicturePtr pDst,
|
|
PictFormatPtr maskFormat,
|
|
INT16 xSrc, INT16 ySrc, int ntris, xTriangle * tris)
|
|
{
|
|
_glamor_triangles(op, pSrc, pDst, maskFormat,
|
|
xSrc, ySrc, ntris, tris, TRUE);
|
|
}
|
|
|
|
Bool
|
|
glamor_triangles_nf(CARD8 op,
|
|
PicturePtr pSrc,
|
|
PicturePtr pDst,
|
|
PictFormatPtr maskFormat,
|
|
INT16 xSrc, INT16 ySrc, int ntris, xTriangle * tris)
|
|
{
|
|
return _glamor_triangles(op, pSrc, pDst, maskFormat,
|
|
xSrc, ySrc, ntris, tris, FALSE);
|
|
}
|
|
|