/**************************************************************************
- *
+ *
* Copyright 2007 VMware, Inc.
* All Rights Reserved.
- *
+ *
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* distribute, sub license, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
- *
+ *
* The above copyright notice and this permission notice (including the
* next paragraph) shall be included in all copies or substantial portions
* of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
+ *
**************************************************************************/
#include "pipe/p_screen.h"
#include "st_atom.h"
#include "st_context.h"
+#include "st_cb_bufferobjects.h"
#include "st_cb_fbo.h"
#include "st_cb_flush.h"
#include "st_cb_texture.h"
pipe_surface_reference(&strb->surface_srgb, NULL);
pipe_surface_reference(&strb->surface_linear, NULL);
strb->surface = NULL;
- pipe_resource_reference( &strb->texture, NULL );
+ pipe_resource_reference(&strb->texture, NULL);
/* If an sRGB framebuffer is unsupported, sRGB formats behave like linear
* formats.
* to <samples> and no more than the next larger sample count supported
* by the implementation.
*
- * So let's find the supported number of samples closest to NumSamples.
- * (NumSamples == 1) is treated the same as (NumSamples == 0).
+ * Find the supported number of samples >= rb->NumSamples
*/
- if (rb->NumSamples > 1) {
- unsigned i;
+ if (rb->NumSamples > 0) {
+ unsigned start, i;
+
+ if (ctx->Const.MaxSamples > 1 && rb->NumSamples == 1) {
+ /* don't try num_samples = 1 with drivers that support real msaa */
+ start = 2;
+ } else {
+ start = rb->NumSamples;
+ }
- for (i = rb->NumSamples; i <= ctx->Const.MaxSamples; i++) {
+ for (i = start; i <= ctx->Const.MaxSamples; i++) {
format = st_choose_renderbuffer_format(st, internalFormat, i);
if (format != PIPE_FORMAT_NONE) {
* renderbuffer). The window system code determines the format.
*/
struct gl_renderbuffer *
-st_new_renderbuffer_fb(enum pipe_format format, int samples, boolean sw)
+st_new_renderbuffer_fb(enum pipe_format format, unsigned samples, boolean sw)
{
struct st_renderbuffer *strb;
strb->software = sw;
switch (format) {
+ case PIPE_FORMAT_B10G10R10A2_UNORM:
+ case PIPE_FORMAT_R10G10B10A2_UNORM:
+ strb->Base.InternalFormat = GL_RGB10_A2;
+ break;
+ case PIPE_FORMAT_R10G10B10X2_UNORM:
+ case PIPE_FORMAT_B10G10R10X2_UNORM:
+ strb->Base.InternalFormat = GL_RGB10;
+ break;
case PIPE_FORMAT_R8G8B8A8_UNORM:
case PIPE_FORMAT_B8G8R8A8_UNORM:
case PIPE_FORMAT_A8R8G8B8_UNORM:
break;
default:
_mesa_problem(NULL,
- "Unexpected format %s in st_new_renderbuffer_fb",
+ "Unexpected format %s in st_new_renderbuffer_fb",
util_format_name(format));
free(strb);
return NULL;
struct gl_renderbuffer_attachment *att)
{
struct st_context *st = st_context(ctx);
- struct pipe_context *pipe = st->pipe;
struct gl_renderbuffer *rb = att->Renderbuffer;
struct st_renderbuffer *strb = st_renderbuffer(rb);
struct pipe_resource *pt;
- if (!st_finalize_texture(ctx, pipe, att->Texture, att->CubeMapFace))
- return;
-
pt = get_teximage_resource(att->Texture,
att->CubeMapFace,
att->TextureLevel);
*/
static GLboolean
st_validate_attachment(struct gl_context *ctx,
- struct pipe_screen *screen,
- const struct gl_renderbuffer_attachment *att,
- unsigned bindings)
+ struct pipe_screen *screen,
+ const struct gl_renderbuffer_attachment *att,
+ unsigned bindings)
{
const struct st_texture_object *stObj = st_texture_object(att->Texture);
enum pipe_format format;
return valid;
}
-
+
/**
* Check that the framebuffer configuration is valid in terms of what
return;
}
- if (!st_validate_attachment(ctx,
- screen,
- depth,
- PIPE_BIND_DEPTH_STENCIL)) {
+ if (!st_validate_attachment(ctx, screen, depth, PIPE_BIND_DEPTH_STENCIL)) {
fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED_EXT;
st_fbo_invalid("Invalid depth attachment");
return;
}
- if (!st_validate_attachment(ctx,
- screen,
- stencil,
- PIPE_BIND_DEPTH_STENCIL)) {
+ if (!st_validate_attachment(ctx, screen, stencil, PIPE_BIND_DEPTH_STENCIL)) {
fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED_EXT;
st_fbo_invalid("Invalid stencil attachment");
return;
&fb->Attachment[BUFFER_COLOR0 + i];
enum pipe_format format;
- if (!st_validate_attachment(ctx,
- screen,
- att,
- PIPE_BIND_RENDER_TARGET)) {
- fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED_EXT;
- st_fbo_invalid("Invalid color attachment");
- return;
+ if (!st_validate_attachment(ctx, screen, att, PIPE_BIND_RENDER_TARGET)) {
+ fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED_EXT;
+ st_fbo_invalid("Invalid color attachment");
+ return;
}
if (!mixed_formats) {
* created FBOs.
*/
static void
-st_DrawBuffers(struct gl_context *ctx, GLsizei count, const GLenum *buffers)
+st_DrawBufferAllocate(struct gl_context *ctx)
{
struct st_context *st = st_context(ctx);
struct gl_framebuffer *fb = ctx->DrawBuffer;
- (void) count;
- (void) buffers;
-
if (_mesa_is_winsys_fbo(fb)) {
GLuint i;
/* add the renderbuffers on demand */
for (i = 0; i < fb->_NumColorDrawBuffers; i++) {
- GLint idx = fb->_ColorDrawBufferIndexes[i];
+ gl_buffer_index idx = fb->_ColorDrawBufferIndexes[i];
- if (idx >= 0) {
+ if (idx != BUFFER_NONE) {
st_manager_add_color_renderbuffer(st, fb, idx);
}
}
/**
- * Called via glReadBuffer. As with st_DrawBuffers, we use this function
- * to check if we need to allocate a renderbuffer on demand.
+ * Called via glReadBuffer. As with st_DrawBufferAllocate, we use this
+ * function to check if we need to allocate a renderbuffer on demand.
*/
static void
st_ReadBuffer(struct gl_context *ctx, GLenum buffer)
struct st_renderbuffer *strb = st_renderbuffer(rb);
struct pipe_context *pipe = st->pipe;
const GLboolean invert = rb->Name == 0;
- unsigned usage;
GLuint y2;
GLubyte *map;
return;
}
- usage = 0x0;
- if (mode & GL_MAP_READ_BIT)
- usage |= PIPE_TRANSFER_READ;
- if (mode & GL_MAP_WRITE_BIT)
- usage |= PIPE_TRANSFER_WRITE;
- if (mode & GL_MAP_INVALIDATE_RANGE_BIT)
- usage |= PIPE_TRANSFER_DISCARD_RANGE;
+ /* Check for unexpected flags */
+ assert((mode & ~(GL_MAP_READ_BIT |
+ GL_MAP_WRITE_BIT |
+ GL_MAP_INVALIDATE_RANGE_BIT)) == 0);
+
+ const enum pipe_transfer_usage transfer_flags =
+ st_access_flags_to_transfer_flags(mode, false);
/* Note: y=0=bottom of buffer while y2=0=top of buffer.
* 'invert' will be true for window-system buffers and false for
strb->texture,
strb->surface->u.tex.level,
strb->surface->u.tex.first_layer,
- usage, x, y2, w, h, &strb->transfer);
+ transfer_flags, x, y2, w, h, &strb->transfer);
if (map) {
if (invert) {
*rowStrideOut = -(int) strb->transfer->stride;
}
+/**
+ * Called via ctx->Driver.EvaluateDepthValues.
+ */
+static void
+st_EvaluateDepthValues(struct gl_context *ctx)
+{
+ struct st_context *st = st_context(ctx);
+
+ st_validate_state(st, ST_PIPELINE_UPDATE_FRAMEBUFFER);
-void st_init_fbo_functions(struct dd_function_table *functions)
+ st->pipe->evaluate_depth_buffer(st->pipe);
+}
+
+
+void
+st_init_fbo_functions(struct dd_function_table *functions)
{
functions->NewFramebuffer = _mesa_new_framebuffer;
functions->NewRenderbuffer = st_new_renderbuffer;
functions->FinishRenderTexture = st_finish_render_texture;
functions->ValidateFramebuffer = st_validate_framebuffer;
- functions->DrawBuffers = st_DrawBuffers;
+ functions->DrawBufferAllocate = st_DrawBufferAllocate;
functions->ReadBuffer = st_ReadBuffer;
functions->MapRenderbuffer = st_MapRenderbuffer;
functions->UnmapRenderbuffer = st_UnmapRenderbuffer;
+ functions->EvaluateDepthValues = st_EvaluateDepthValues;
}
-
-
projects / mesa.git / blobdiff