st/mesa: Make st_cb_blit.h FEATURE_EXT_framebuffer_blit aware.
This change allows st_cb_blit.h to be used without knowing if FEATURE_EXT_framebuffer_blit is enabled.
This commit is contained in:
parent
16775f4951
commit
e76e17d569
|
@ -60,6 +60,7 @@ st_destroy_blit(struct st_context *st)
|
||||||
|
|
||||||
|
|
||||||
#if FEATURE_EXT_framebuffer_blit
|
#if FEATURE_EXT_framebuffer_blit
|
||||||
|
|
||||||
static void
|
static void
|
||||||
st_BlitFramebuffer(GLcontext *ctx,
|
st_BlitFramebuffer(GLcontext *ctx,
|
||||||
GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
|
GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
|
||||||
|
@ -207,14 +208,12 @@ st_BlitFramebuffer(GLcontext *ctx,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif /* FEATURE_EXT_framebuffer_blit */
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void
|
void
|
||||||
st_init_blit_functions(struct dd_function_table *functions)
|
st_init_blit_functions(struct dd_function_table *functions)
|
||||||
{
|
{
|
||||||
#if FEATURE_EXT_framebuffer_blit
|
|
||||||
functions->BlitFramebuffer = st_BlitFramebuffer;
|
functions->BlitFramebuffer = st_BlitFramebuffer;
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif /* FEATURE_EXT_framebuffer_blit */
|
||||||
|
|
|
@ -29,18 +29,28 @@
|
||||||
#define ST_CB_BLIT_H
|
#define ST_CB_BLIT_H
|
||||||
|
|
||||||
|
|
||||||
|
#include "main/mtypes.h"
|
||||||
#include "st_context.h"
|
#include "st_context.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
extern void
|
extern void
|
||||||
st_init_blit(struct st_context *st);
|
st_init_blit(struct st_context *st);
|
||||||
|
|
||||||
extern void
|
extern void
|
||||||
st_destroy_blit(struct st_context *st);
|
st_destroy_blit(struct st_context *st);
|
||||||
|
|
||||||
|
#if FEATURE_EXT_framebuffer_blit
|
||||||
|
|
||||||
extern void
|
extern void
|
||||||
st_init_blit_functions(struct dd_function_table *functions);
|
st_init_blit_functions(struct dd_function_table *functions);
|
||||||
|
|
||||||
|
#else
|
||||||
|
|
||||||
|
static INLINE void
|
||||||
|
st_init_blit_functions(struct dd_function_table *functions)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif /* FEATURE_EXT_framebuffer_blit */
|
||||||
|
|
||||||
#endif /* ST_CB_BLIT_H */
|
#endif /* ST_CB_BLIT_H */
|
||||||
|
|
|
@ -212,9 +212,7 @@ static void st_destroy_context_priv( struct st_context *st )
|
||||||
st_destroy_atoms( st );
|
st_destroy_atoms( st );
|
||||||
st_destroy_draw( st );
|
st_destroy_draw( st );
|
||||||
st_destroy_generate_mipmap(st);
|
st_destroy_generate_mipmap(st);
|
||||||
#if FEATURE_EXT_framebuffer_blit
|
|
||||||
st_destroy_blit(st);
|
st_destroy_blit(st);
|
||||||
#endif
|
|
||||||
st_destroy_clear(st);
|
st_destroy_clear(st);
|
||||||
st_destroy_bitmap(st);
|
st_destroy_bitmap(st);
|
||||||
st_destroy_drawpix(st);
|
st_destroy_drawpix(st);
|
||||||
|
@ -281,9 +279,7 @@ void st_init_driver_functions(struct dd_function_table *functions)
|
||||||
_mesa_init_glsl_driver_functions(functions);
|
_mesa_init_glsl_driver_functions(functions);
|
||||||
|
|
||||||
st_init_accum_functions(functions);
|
st_init_accum_functions(functions);
|
||||||
#if FEATURE_EXT_framebuffer_blit
|
|
||||||
st_init_blit_functions(functions);
|
st_init_blit_functions(functions);
|
||||||
#endif
|
|
||||||
st_init_bufferobject_functions(functions);
|
st_init_bufferobject_functions(functions);
|
||||||
st_init_clear_functions(functions);
|
st_init_clear_functions(functions);
|
||||||
st_init_bitmap_functions(functions);
|
st_init_bitmap_functions(functions);
|
||||||
|
|
Loading…
Reference in New Issue