#include "st_cb_texture.h"
#include "st_format.h"
#include "st_texture.h"
+#include "st_util.h"
#include "st_manager.h"
#include "util/u_format.h"
format = PIPE_FORMAT_R16G16B16A16_SNORM;
}
else {
- format = st_choose_renderbuffer_format(st, internalFormat, 0);
+ format = st_choose_renderbuffer_format(st, internalFormat, 0, 0);
/* Not setting gl_renderbuffer::Format here will cause
* FRAMEBUFFER_UNSUPPORTED and ValidateFramebuffer will not be called.
/* If an sRGB framebuffer is unsupported, sRGB formats behave like linear
* formats.
*/
- if (!ctx->Extensions.EXT_framebuffer_sRGB) {
+ if (!ctx->Extensions.EXT_sRGB) {
internalFormat = _mesa_get_linear_internalformat(internalFormat);
}
* Find the supported number of samples >= rb->NumSamples
*/
if (rb->NumSamples > 0) {
- unsigned start, i;
+ unsigned start, start_storage;
if (ctx->Const.MaxSamples > 1 && rb->NumSamples == 1) {
/* don't try num_samples = 1 with drivers that support real msaa */
start = 2;
+ start_storage = 2;
} else {
start = rb->NumSamples;
+ start_storage = rb->NumStorageSamples;
}
- for (i = start; i <= ctx->Const.MaxSamples; i++) {
- format = st_choose_renderbuffer_format(st, internalFormat, i);
-
- if (format != PIPE_FORMAT_NONE) {
- rb->NumSamples = i;
- rb->NumStorageSamples = i;
- break;
+ if (ctx->Extensions.AMD_framebuffer_multisample_advanced) {
+ if (rb->_BaseFormat == GL_DEPTH_COMPONENT ||
+ rb->_BaseFormat == GL_DEPTH_STENCIL ||
+ rb->_BaseFormat == GL_STENCIL_INDEX) {
+ /* Find a supported depth-stencil format. */
+ for (unsigned samples = start;
+ samples <= ctx->Const.MaxDepthStencilFramebufferSamples;
+ samples++) {
+ format = st_choose_renderbuffer_format(st, internalFormat,
+ samples, samples);
+
+ if (format != PIPE_FORMAT_NONE) {
+ rb->NumSamples = samples;
+ rb->NumStorageSamples = samples;
+ break;
+ }
+ }
+ } else {
+ /* Find a supported color format, samples >= storage_samples. */
+ for (unsigned storage_samples = start_storage;
+ storage_samples <= ctx->Const.MaxColorFramebufferStorageSamples;
+ storage_samples++) {
+ for (unsigned samples = MAX2(start, storage_samples);
+ samples <= ctx->Const.MaxColorFramebufferSamples;
+ samples++) {
+ format = st_choose_renderbuffer_format(st, internalFormat,
+ samples,
+ storage_samples);
+
+ if (format != PIPE_FORMAT_NONE) {
+ rb->NumSamples = samples;
+ rb->NumStorageSamples = storage_samples;
+ goto found;
+ }
+ }
+ }
+ found:;
+ }
+ } else {
+ for (unsigned samples = start; samples <= ctx->Const.MaxSamples;
+ samples++) {
+ format = st_choose_renderbuffer_format(st, internalFormat,
+ samples, samples);
+
+ if (format != PIPE_FORMAT_NONE) {
+ rb->NumSamples = samples;
+ rb->NumStorageSamples = samples;
+ break;
+ }
}
}
} else {
- format = st_choose_renderbuffer_format(st, internalFormat, 0);
+ format = st_choose_renderbuffer_format(st, internalFormat, 0, 0);
}
/* Not setting gl_renderbuffer::Format here will cause
struct st_context *st = st_context(ctx);
pipe_surface_release(st->pipe, &strb->surface_srgb);
pipe_surface_release(st->pipe, &strb->surface_linear);
- strb->surface = NULL;
+ } else {
+ pipe_surface_release_no_context(&strb->surface_srgb);
+ pipe_surface_release_no_context(&strb->surface_linear);
}
+ strb->surface = NULL;
pipe_resource_reference(&strb->texture, NULL);
free(strb->data);
_mesa_delete_renderbuffer(ctx, rb);
if (!surf ||
surf->texture->nr_samples != strb->Base.NumSamples ||
+ surf->texture->nr_storage_samples != strb->Base.NumStorageSamples ||
surf->format != format ||
surf->texture != resource ||
surf->width != rtt_width ||
surf->height != rtt_height ||
+ surf->nr_samples != strb->rtt_nr_samples ||
surf->u.tex.level != level ||
surf->u.tex.first_layer != first_layer ||
surf->u.tex.last_layer != last_layer) {
struct pipe_surface surf_tmpl;
memset(&surf_tmpl, 0, sizeof(surf_tmpl));
surf_tmpl.format = format;
+ surf_tmpl.nr_samples = strb->rtt_nr_samples;
surf_tmpl.u.tex.level = level;
surf_tmpl.u.tex.first_layer = first_layer;
surf_tmpl.u.tex.last_layer = last_layer;
strb->rtt_face = att->CubeMapFace;
strb->rtt_slice = att->Zoffset;
strb->rtt_layered = att->Layered;
+ strb->rtt_nr_samples = att->NumSamples;
pipe_resource_reference(&strb->texture, pt);
st_update_renderbuffer_surface(st, strb);
/* If the encoding is sRGB and sRGB rendering cannot be enabled,
* check for linear format support instead.
* Later when we create a surface, we change the format to a linear one. */
- if (!ctx->Extensions.EXT_framebuffer_sRGB &&
+ if (!ctx->Extensions.EXT_sRGB &&
_mesa_get_format_color_encoding(texFormat) == GL_SRGB) {
const mesa_format linearFormat = _mesa_get_srgb_format_linear(texFormat);
format = st_mesa_format_to_pipe_format(st_context(ctx), linearFormat);
}
+/**
+ * Called by ctx->Driver.DiscardFramebuffer
+ */
+static void
+st_discard_framebuffer(struct gl_context *ctx, struct gl_framebuffer *fb,
+ struct gl_renderbuffer_attachment *att)
+{
+ struct st_context *st = st_context(ctx);
+ struct pipe_resource *prsc;
+
+ if (!att->Renderbuffer)
+ return;
+
+ prsc = st_renderbuffer(att->Renderbuffer)->surface->texture;
+
+ /* using invalidate_resource will only work for simple 2D resources */
+ if (prsc->depth0 != 1 || prsc->array_size != 1 || prsc->last_level != 0)
+ return;
+
+ if (st->pipe->invalidate_resource)
+ st->pipe->invalidate_resource(st->pipe, prsc);
+}
+
+
/**
* Called via glDrawBuffer. We only provide this driver function so that we
* can check if we need to allocate a new renderbuffer. Specifically, we
functions->RenderTexture = st_render_texture;
functions->FinishRenderTexture = st_finish_render_texture;
functions->ValidateFramebuffer = st_validate_framebuffer;
+ functions->DiscardFramebuffer = st_discard_framebuffer;
functions->DrawBufferAllocate = st_DrawBufferAllocate;
functions->ReadBuffer = st_ReadBuffer;
projects / mesa.git / blobdiff