[Mesa-dev] [PATCH 2/2] mesa/st: disable ARB_framebuffer_object when no driver support.

2013-10-04 Thread Ilia Mirkin
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 imir...@alum.mit.edu
---
 src/mesa/state_tracker/st_extensions.c | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/mesa/state_tracker/st_extensions.c 
b/src/mesa/state_tracker/st_extensions.c
index 97dd732..0df914d 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -444,8 +444,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 */
@@ -759,6 +758,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
-- 
1.8.1.5

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev


[Mesa-dev] [PATCH 2/2] mesa/st: disable ARB_framebuffer_object when no driver support.

2013-09-07 Thread Ilia Mirkin
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 imir...@alum.mit.edu
---
 src/mesa/state_tracker/st_extensions.c | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/mesa/state_tracker/st_extensions.c 
b/src/mesa/state_tracker/st_extensions.c
index 0b7001b..670e32d 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -441,8 +441,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 */
@@ -756,6 +755,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
-- 
1.8.1.5

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev