Mesa (master): st/mesa: test for FEATURE defines

Chia-I Wu olv at kemper.freedesktop.org
Mon Aug 16 12:30:49 UTC 2010


Module: Mesa
Branch: master
Commit: 9d4a0d7d4df3934cdefe4fe1118603e618d59831
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9d4a0d7d4df3934cdefe4fe1118603e618d59831

Author: nobled <nobled at dreamwidth.org>
Date:   Fri Aug 13 20:23:11 2010 +0000

st/mesa: test for FEATURE defines

'struct dd_function_table' only conditionally contains
the function pointer NewFramebuffer and friends based on
FEATURE_EXT_framebuffer_* defines. (See src/mesa/main/dd.h)

Fixes the build when the features are disabled and the vfuncs
don't exist.

---

 src/mesa/state_tracker/st_cb_fbo.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/mesa/state_tracker/st_cb_fbo.c b/src/mesa/state_tracker/st_cb_fbo.c
index 13119ce..86bb788 100644
--- a/src/mesa/state_tracker/st_cb_fbo.c
+++ b/src/mesa/state_tracker/st_cb_fbo.c
@@ -543,6 +543,7 @@ st_ReadBuffer(GLcontext *ctx, GLenum buffer)
 
 void st_init_fbo_functions(struct dd_function_table *functions)
 {
+#if FEATURE_EXT_framebuffer_object
    functions->NewFramebuffer = st_new_framebuffer;
    functions->NewRenderbuffer = st_new_renderbuffer;
    functions->BindFramebuffer = st_bind_framebuffer;
@@ -550,6 +551,7 @@ void st_init_fbo_functions(struct dd_function_table *functions)
    functions->RenderTexture = st_render_texture;
    functions->FinishRenderTexture = st_finish_render_texture;
    functions->ValidateFramebuffer = st_validate_framebuffer;
+#endif
    /* no longer needed by core Mesa, drivers handle resizes...
    functions->ResizeBuffers = st_resize_buffers;
    */




More information about the mesa-commit mailing list