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

Always bind packed depth stencil formats to both attacment points

Browse Source 
Review URL: http://codereview.appspot.com/4372048/



git-svn-id: http://skia.googlecode.com/svn/trunk@1087 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
bsalomon@google.com 2011-04-08 19:00:04 +00:00
parent 4281d65093
commit 9283b583ab
1 changed files with 27 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
gpu/src/GrGpuGL.cpp
View File

@ -589,25 +589,26 @@ static const GrGLuint UNKNOWN_BITS = ~0;
struct StencilFormat { struct StencilFormat {
GrGLenum fEnum; GrGLenum fEnum;
GrGLuint fBits; GrGLuint fBits;
bool fPacked;
}; };
const StencilFormat* GrGLStencilFormats() { const StencilFormat* GrGLStencilFormats() {
// defines stencil formats from more to less preferred // defines stencil formats from more to less preferred
static const StencilFormat desktopStencilFormats[] = { static const StencilFormat desktopStencilFormats[] = {
{GR_GL_STENCIL_INDEX8, 8}, {GR_GL_STENCIL_INDEX8, 8, false},
{GR_GL_STENCIL_INDEX16, 16}, {GR_GL_STENCIL_INDEX16, 16, false},
{GR_GL_DEPTH24_STENCIL8, 8}, {GR_GL_DEPTH24_STENCIL8, 8, true },
{GR_GL_STENCIL_INDEX4, 4}, {GR_GL_STENCIL_INDEX4, 4, false},
{GR_GL_STENCIL_INDEX, UNKNOWN_BITS}, {GR_GL_STENCIL_INDEX, UNKNOWN_BITS, false},
{GR_GL_DEPTH_STENCIL, UNKNOWN_BITS}, {GR_GL_DEPTH_STENCIL, UNKNOWN_BITS, true },
{0, 0} {0, 0, false}
}; };
static const StencilFormat esStencilFormats[] = { static const StencilFormat esStencilFormats[] = {
{GR_GL_STENCIL_INDEX8, 8}, {GR_GL_STENCIL_INDEX8, 8, false},
{GR_GL_DEPTH24_STENCIL8, 8}, {GR_GL_DEPTH24_STENCIL8, 8, true },
{GR_GL_STENCIL_INDEX4, 4}, {GR_GL_STENCIL_INDEX4, 4, false},
{0, 0} {0, 0, false}
}; };
if (GR_GL_SUPPORT_DESKTOP) { if (GR_GL_SUPPORT_DESKTOP) {
@ -941,37 +942,28 @@ GrTexture* GrGpuGL::createTextureHelper(const TextureDesc& desc,
GR_GL_STENCIL_ATTACHMENT, GR_GL_STENCIL_ATTACHMENT,
GR_GL_RENDERBUFFER, GR_GL_RENDERBUFFER,
rtIDs.fStencilRenderbufferID)); rtIDs.fStencilRenderbufferID));
// if it is a packed format bind to depth also, otherwise
// we may get an unsupported fbo completeness result
if (stencilFormats[i].fPacked) {
GR_GL(FramebufferRenderbuffer(GR_GL_FRAMEBUFFER,
GR_GL_DEPTH_ATTACHMENT,
GR_GL_RENDERBUFFER,
rtIDs.fStencilRenderbufferID));
}
} }
status = GR_GL(CheckFramebufferStatus(GR_GL_FRAMEBUFFER)); status = GR_GL(CheckFramebufferStatus(GR_GL_FRAMEBUFFER));
if (GR_GL_SUPPORT_DESKTOP) {
// On some implementations you have to be bound as DEPTH_STENCIL.
// (Even binding to DEPTH and STENCIL separately with the same
// buffer doesn't work.)
if (rtIDs.fStencilRenderbufferID &&
status != GR_GL_FRAMEBUFFER_COMPLETE) {
GR_GL(FramebufferRenderbuffer(GR_GL_FRAMEBUFFER,
GR_GL_STENCIL_ATTACHMENT,
GR_GL_RENDERBUFFER,
0));
GR_GL(FramebufferRenderbuffer(GR_GL_FRAMEBUFFER,
GR_GL_DEPTH_STENCIL_ATTACHMENT,
GR_GL_RENDERBUFFER,
rtIDs.fStencilRenderbufferID));
status = GR_GL(CheckFramebufferStatus(GR_GL_FRAMEBUFFER));
}
}
if (status != GR_GL_FRAMEBUFFER_COMPLETE) { if (status != GR_GL_FRAMEBUFFER_COMPLETE) {
GrPrintf("-- glCheckFramebufferStatus %x %d %d\n", GrPrintf("-- glCheckFramebufferStatus %x %d %d\n",
status, desc.fWidth, desc.fHeight); status, desc.fWidth, desc.fHeight);
if (GR_GL_SUPPORT_DESKTOP) { // undo the depth bind
if (rtIDs.fStencilRenderbufferID) { if (rtIDs.fStencilRenderbufferID &&
stencilFormats[i].fPacked) {
GR_GL(FramebufferRenderbuffer(GR_GL_FRAMEBUFFER, GR_GL(FramebufferRenderbuffer(GR_GL_FRAMEBUFFER,
GR_GL_DEPTH_STENCIL_ATTACHMENT, GR_GL_DEPTH_ATTACHMENT,
GR_GL_RENDERBUFFER, GR_GL_RENDERBUFFER,
0)); 0));
} }
}
continue; continue;
} }
// we're successful! // we're successful!