fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-04 23:40:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

intel: Drop intel_wrap_miptree().

Browse source 
Most of this function was just calling
intel_renderbuffer_update_wrapper(), which was called immediately
afterwards in the only caller.

NOTE: This is a candidate for the 8.0 branch.
(cherry picked from commit 74484c5d41)
This commit is contained in:
Eric Anholt 2012-01-19 17:32:55 -08:00 • committed by Ian Romanick
parent f811d501b6
commit 1100a19da8
1 changed files with 3 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
src/mesa/drivers/dri/intel/intel_fbo.c
View file

@ -457,14 +457,6 @@ intel_framebuffer_renderbuffer(struct gl_context * ctx,
intel_draw_buffer(ctx);
}
static struct intel_renderbuffer*
intel_renderbuffer_wrap_miptree(struct intel_context *intel,
struct intel_mipmap_tree *mt,
uint32_t level,
uint32_t layer,
gl_format format,
GLenum internal_format);
/**
* \par Special case for separate stencil
*
@ -516,45 +508,6 @@ intel_renderbuffer_update_wrapper(struct intel_context *intel,
return true;
}
/**
* \brief Wrap a renderbuffer around a single slice of a miptree.
*
* Called by glFramebufferTexture*(). This just allocates a
* ``struct intel_renderbuffer`` then calls
* intel_renderbuffer_update_wrapper() to do the real work.
*
* \see intel_renderbuffer_update_wrapper()
*/
static struct intel_renderbuffer*
intel_renderbuffer_wrap_miptree(struct intel_context *intel,
struct intel_mipmap_tree *mt,
uint32_t level,
uint32_t layer,
gl_format format,
GLenum internal_format)
{
struct gl_context *ctx = &intel->ctx;
struct gl_renderbuffer *rb;
struct intel_renderbuffer *irb;
intel_miptree_check_level_layer(mt, level, layer);
rb = intel_new_renderbuffer(ctx, ~0);
irb = intel_renderbuffer(rb);
if (!irb)
return NULL;
if (!intel_renderbuffer_update_wrapper(intel, irb,
mt, level, layer,
format, internal_format)) {
free(irb);
return NULL;
}
return irb;
}
void
intel_renderbuffer_set_draw_offset(struct intel_renderbuffer *irb)
{
@ -660,12 +613,9 @@ intel_render_texture(struct gl_context * ctx,
return;
}
else if (!irb) {
irb = intel_renderbuffer_wrap_miptree(intel,
mt,
att->TextureLevel,
layer,
image->TexFormat,
image->InternalFormat);
intel_miptree_check_level_layer(mt, att->TextureLevel, layer);
irb = (struct intel_renderbuffer *)intel_new_renderbuffer(ctx, ~0);
if (irb) {
/* bind the wrapper to the attachment point */