mesa: initialize gl_renderbuffer::Depth in core
authorMarek Olšák <marek.olsak@amd.com>
Wed, 20 Nov 2013 00:47:36 +0000 (01:47 +0100)
committerMarek Olšák <marek.olsak@amd.com>
Sat, 23 Nov 2013 00:54:57 +0000 (01:54 +0100)
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Tested-by: Ian Romanick <ian.d.romanick@intel.com>
src/mesa/drivers/dri/i915/intel_fbo.c
src/mesa/drivers/dri/i965/intel_fbo.c
src/mesa/main/fbobject.c

index f534386..36b22ca 100644 (file)
@@ -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);
index 472d2ca..9136215 100644 (file)
@@ -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);
index 3650627..861885d 100644 (file)
@@ -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;