AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Roll out r3117 to alleviate http://code.google.com/p/skia/issues/detail?id=471 ('filltypespersp gm test fails with KERN_PROTECTION_FAILURE on Lion')

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@3122 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
epoger@google.com 2012-01-31 17:18:58 +00:00
parent d414666d18
commit 8722d7c3e0
3 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/gpu/GrGpu.cpp
View File

@ -343,20 +343,15 @@ const GrVertexBuffer* GrGpu::getUnitSquareVertexBuffer() const {
////////////////////////////////////////////////////////////////////////////////
const GrStencilSettings* GrGpu::GetClipStencilSettings(void) {
// stencil settings to use when clip is in stencil
// NOTE: This is thread-safe on Windows because the implementation of
// GR_STATIC_CONST_SAME_STENCIL simply updates a pointer to an already
// constructed constant structure.
GR_STATIC_CONST_SAME_STENCIL(sClipStencilSettings,
kKeep_StencilOp,
kKeep_StencilOp,
kAlwaysIfInClip_StencilFunc,
0x0000,
0x0000,
0x0000);
return &sClipStencilSettings;
}
// stencil settings to use when clip is in stencil
GR_STATIC_CONST_SAME_STENCIL(gClipStencilSettings,
kKeep_StencilOp,
kKeep_StencilOp,
kAlwaysIfInClip_StencilFunc,
0x0000,
0x0000,
0x0000);
const GrStencilSettings& GrGpu::gClipStencilSettings = ::gClipStencilSettings;
// mapping of clip-respecting stencil funcs to normal stencil funcs
// mapping depends on whether stencil-clipping is in effect.

2
src/gpu/GrGpu.h
View File

@ -355,7 +355,7 @@ protected:
// stencil settings to clip drawing when stencil clipping is in effect
// and the client isn't using the stencil test.
static const GrStencilSettings* GetClipStencilSettings(void);
static const GrStencilSettings& gClipStencilSettings;
GrGpuStats fStats;

2
src/gpu/GrGpuGL.cpp
View File

@ -1776,7 +1776,7 @@ void GrGpuGL::flushStencil() {
if (settings->isDisabled()) {
if (stencilClip) {
settings = GetClipStencilSettings();
settings = &gClipStencilSettings;
}
}