diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2006-03-28 15:24:50 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2006-03-28 15:24:50 +0000 |
| commit | 9f6ff49650646fcac29289ebabd7269c1795deed (patch) | |
| tree | 89390f01700e288b76aa46f436aae96807eeacda | |
| parent | c7a5d528c7e5f4812b423bf4c091d21c34af3cf1 (diff) | |
update conditional for render to GL_DEPTH_STENCIL texture, check for valid teximage before calling ctx->Driver.RenderTexture()
| -rw-r--r-- | src/mesa/main/fbobject.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c index ec690bdbf7..191b81c39c 100644 --- a/src/mesa/main/fbobject.c +++ b/src/mesa/main/fbobject.c @@ -457,8 +457,8 @@ _mesa_test_framebuffer_completeness(GLcontext *ctx, struct gl_framebuffer *fb) h = texImg->Height; f = texImg->_BaseFormat; numImages++; - if (f != GL_RGB && f != GL_RGBA && f != GL_DEPTH_COMPONENT) { - /* XXX need GL_DEPTH_STENCIL_EXT test? */ + if (f != GL_RGB && f != GL_RGBA && f != GL_DEPTH_COMPONENT + && f != GL_DEPTH_STENCIL_EXT) { fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT; fbo_incomplete("texture attachment incomplete", -1); return; @@ -922,7 +922,8 @@ check_begin_texture_render(GLcontext *ctx, struct gl_framebuffer *fb) for (i = 0; i < BUFFER_COUNT; i++) { struct gl_renderbuffer_attachment *att = fb->Attachment + i; struct gl_texture_object *texObj = att->Texture; - if (texObj) { + if (texObj + && att->Texture->Image[att->CubeMapFace][att->TextureLevel]) { ctx->Driver.RenderTexture(ctx, fb, att); } } |