fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 21:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

intel: Allocate s8_z24 non-texture renderbuffers when using separate stencil

Browse source 
Now all infrastructure is in place to support s8_z24 non-texture
renderbuffers for gen7.

Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Chad Versace <chad@chad-versace.us>
This commit is contained in:
Chad Versace 2011-06-17 12:12:35 -07:00
parent 36e05c6870
commit 3db27d4a4a
1 changed files with 81 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -107,6 +107,12 @@ intel_get_pointer(struct gl_context * ctx, struct gl_renderbuffer *rb,
}
static struct gl_renderbuffer*
intel_create_wrapped_renderbuffer(struct gl_context * ctx,
struct gl_renderbuffer *wrapper,
gl_format format);
/**
* Called via glRenderbufferStorageEXT() to set the format and allocate
* storage for a user-created renderbuffer.
@ -147,6 +153,8 @@ intel_alloc_renderbuffer_storage(struct gl_context * ctx, struct gl_renderbuffer
break;
}
rb->Width = width;
rb->Height = height;
rb->_BaseFormat = _mesa_base_fbo_format(ctx, internalFormat);
rb->DataType = intel_mesa_format_to_rb_datatype(rb->Format);
cpp = _mesa_get_format_bytes(rb->Format);
@ -199,6 +207,38 @@ intel_alloc_renderbuffer_storage(struct gl_context * ctx, struct gl_renderbuffer
if (!irb->region)
return false;
} else if (irb->Base.Format == MESA_FORMAT_S8_Z24
&& intel->must_use_separate_stencil) {
bool ok = true;
struct gl_renderbuffer *depth_rb;
struct gl_renderbuffer *stencil_rb;
depth_rb = intel_create_wrapped_renderbuffer(ctx, rb,
MESA_FORMAT_X8_Z24);
stencil_rb = intel_create_wrapped_renderbuffer(ctx, rb,
MESA_FORMAT_S8);
ok = depth_rb && stencil_rb;
ok = ok && intel_alloc_renderbuffer_storage(ctx, depth_rb,
depth_rb->InternalFormat,
width, height);
ok = ok && intel_alloc_renderbuffer_storage(ctx, stencil_rb,
stencil_rb->InternalFormat,
width, height);
if (!ok) {
if (depth_rb) {
intel_delete_renderbuffer(depth_rb);
}
if (stencil_rb) {
intel_delete_renderbuffer(stencil_rb);
}
return false;
}
_mesa_reference_renderbuffer(&irb->wrapped_depth, depth_rb);
_mesa_reference_renderbuffer(&irb->wrapped_stencil, stencil_rb);
} else {
irb->region = intel_region_alloc(intel->intelScreen, tiling, cpp,
width, height, GL_TRUE);
@ -219,9 +259,6 @@ intel_alloc_renderbuffer_storage(struct gl_context * ctx, struct gl_renderbuffer
}
}
rb->Width = width;
rb->Height = height;
return GL_TRUE;
}
@ -372,6 +409,47 @@ intel_create_renderbuffer(gl_format format)
}
static struct gl_renderbuffer *
intel_create_wrapped_renderbuffer(struct gl_context * ctx,
struct gl_renderbuffer *wrapper,
gl_format format)
{
/*
* The name here is irrelevant, as long as its nonzero, because the
* renderbuffer never gets entered into Mesa's renderbuffer hash table.
*/
GLuint name = ~0;
struct intel_renderbuffer *irb = CALLOC_STRUCT(intel_renderbuffer);
if (!irb) {
_mesa_error(ctx, GL_OUT_OF_MEMORY, "creating renderbuffer");
return NULL;
}
struct gl_renderbuffer *rb = &irb->Base;
_mesa_init_renderbuffer(rb, name);
rb->ClassID = INTEL_RB_CLASS;
rb->_BaseFormat = _mesa_get_format_base_format(format);
rb->Format = format;
rb->InternalFormat = rb->_BaseFormat;
rb->DataType = intel_mesa_format_to_rb_datatype(format);
rb->Width = wrapper->Width;
rb->Height = wrapper->Height;
rb->AllocStorage = intel_nop_alloc_storage;
rb->Delete = intel_delete_renderbuffer;
rb->GetPointer = intel_get_pointer;
/*
* A refcount here would cause a cyclic reference. The wrapper references
* the unwrapper.
*/
rb->Wrapped = wrapper;
return rb;
}
/**
* Create a new renderbuffer object.
* Typically called via glBindRenderbufferEXT().