summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIlia Mirkin <[email protected]>2013-10-04 04:32:16 -0400
committerMarek Olšák <[email protected]>2013-10-26 01:36:07 +0200
commita7ce1fef27ccfe388b4c11017f64f4fe83ca6f6d (patch)
tree15834436a7149a2f1e28cad025f1946d51530eb5
parent12d39b4fa8c3265bd95704371467f1c42072dc86 (diff)
mesa/st: disable ARB_framebuffer_object when no driver support.
When PIPE_CAP_MIXED_FRAMEBUFFER_SIZES is not provided, parts of ARB_framebuffer_object can't be supported, such as on NV30. Signed-off-by: Ilia Mirkin <[email protected]> Signed-off-by: Marek Olšák <[email protected]>
-rw-r--r--src/mesa/state_tracker/st_extensions.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index 231bb395a06..6635d624e65 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -445,8 +445,7 @@ void st_init_extensions(struct st_context *st)
{ PIPE_FORMAT_Z32_FLOAT,
PIPE_FORMAT_Z32_FLOAT_S8X24_UINT } },
- { { o(ARB_framebuffer_object),
- o(EXT_packed_depth_stencil) },
+ { { o(EXT_packed_depth_stencil) },
{ PIPE_FORMAT_S8_UINT_Z24_UNORM,
PIPE_FORMAT_Z24_UNORM_S8_UINT },
GL_TRUE }, /* at least one format must be supported */
@@ -760,6 +759,10 @@ void st_init_extensions(struct st_context *st)
PIPE_BUFFER, PIPE_BIND_SAMPLER_VIEW);
}
+ if (screen->get_param(screen, PIPE_CAP_MIXED_FRAMEBUFFER_SIZES) &&
+ ctx->Extensions.EXT_packed_depth_stencil) {
+ ctx->Extensions.ARB_framebuffer_object = GL_TRUE;
+ }
/* Unpacking a varying in the fragment shader costs 1 texture indirection.
* If the number of available texture indirections is very limited, then we