Module: Mesa Branch: master Commit: a3969aa125c8f61b093a5f5f69e8265a131051d0 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a3969aa125c8f61b093a5f5f69e8265a131051d0
Author: Marek Olšák <[email protected]> Date: Wed Nov 20 01:47:36 2013 +0100 mesa: initialize gl_renderbuffer::Depth in core Reviewed-by: Ian Romanick <[email protected]> Tested-by: Ian Romanick <[email protected]> --- src/mesa/drivers/dri/i915/intel_fbo.c | 2 -- src/mesa/drivers/dri/i965/intel_fbo.c | 2 -- src/mesa/main/fbobject.c | 1 + 3 files changed, 1 insertions(+), 4 deletions(-) diff --git a/src/mesa/drivers/dri/i915/intel_fbo.c b/src/mesa/drivers/dri/i915/intel_fbo.c index f534386..36b22ca 100644 --- a/src/mesa/drivers/dri/i915/intel_fbo.c +++ b/src/mesa/drivers/dri/i915/intel_fbo.c @@ -420,8 +420,6 @@ intel_renderbuffer_update_wrapper(struct intel_context *intel, struct intel_mipmap_tree *mt = intel_image->mt; int level = image->Level; - rb->Depth = image->Depth; - rb->AllocStorage = intel_nop_alloc_storage; intel_miptree_check_level_layer(mt, level, layer); diff --git a/src/mesa/drivers/dri/i965/intel_fbo.c b/src/mesa/drivers/dri/i965/intel_fbo.c index 472d2ca..9136215 100644 --- a/src/mesa/drivers/dri/i965/intel_fbo.c +++ b/src/mesa/drivers/dri/i965/intel_fbo.c @@ -423,8 +423,6 @@ intel_renderbuffer_update_wrapper(struct brw_context *brw, struct intel_mipmap_tree *mt = intel_image->mt; int level = image->Level; - rb->Depth = image->Depth; - rb->AllocStorage = intel_nop_alloc_storage; intel_miptree_check_level_layer(mt, level, layer); diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c index 3650627..861885d 100644 --- a/src/mesa/main/fbobject.c +++ b/src/mesa/main/fbobject.c @@ -411,6 +411,7 @@ _mesa_update_texture_renderbuffer(struct gl_context *ctx, rb->InternalFormat = texImage->InternalFormat; rb->Width = texImage->Width2; rb->Height = texImage->Height2; + rb->Depth = texImage->Depth2; rb->NumSamples = texImage->NumSamples; rb->TexImage = texImage; _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
