mesa: remove FEATURE_drawpix define.
Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com> Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
@@ -39,9 +39,6 @@
|
||||
#include "fbobject.h"
|
||||
|
||||
|
||||
#if FEATURE_drawpix
|
||||
|
||||
|
||||
/*
|
||||
* Execute glDrawPixels
|
||||
*/
|
||||
@@ -379,6 +376,3 @@ _mesa_init_drawpix_dispatch(struct _glapi_table *disp)
|
||||
SET_CopyPixels(disp, _mesa_CopyPixels);
|
||||
SET_DrawPixels(disp, _mesa_DrawPixels);
|
||||
}
|
||||
|
||||
|
||||
#endif /* FEATURE_drawpix */
|
||||
|
@@ -32,19 +32,8 @@
|
||||
struct _glapi_table;
|
||||
|
||||
|
||||
#if FEATURE_drawpix
|
||||
|
||||
extern void
|
||||
_mesa_init_drawpix_dispatch(struct _glapi_table *disp);
|
||||
|
||||
#else /* FEATURE_drawpix */
|
||||
|
||||
static inline void
|
||||
_mesa_init_drawpix_dispatch(struct _glapi_table *disp)
|
||||
{
|
||||
}
|
||||
|
||||
#endif /* FEATURE_drawpix */
|
||||
|
||||
|
||||
#endif /* DRAWPIX_H */
|
||||
|
@@ -84,7 +84,6 @@
|
||||
#define FEATURE_remap_table 0
|
||||
#endif
|
||||
|
||||
#define FEATURE_drawpix FEATURE_GL
|
||||
#define FEATURE_evaluators FEATURE_GL
|
||||
#define FEATURE_feedback FEATURE_GL
|
||||
#define FEATURE_pixel_transfer FEATURE_GL
|
||||
|
@@ -57,8 +57,6 @@
|
||||
#include "cso_cache/cso_context.h"
|
||||
|
||||
|
||||
#if FEATURE_drawpix
|
||||
|
||||
/**
|
||||
* glBitmaps are drawn as textured quads. The user's bitmap pattern
|
||||
* is stored in a texture image. An alpha8 texture format is used.
|
||||
@@ -884,5 +882,3 @@ st_destroy_bitmap(struct st_context *st)
|
||||
st->bitmap.cache = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
#endif /* FEATURE_drawpix */
|
||||
|
@@ -38,8 +38,6 @@ struct st_context;
|
||||
struct gl_fragment_program;
|
||||
struct st_fragment_program;
|
||||
|
||||
#if FEATURE_drawpix
|
||||
|
||||
extern void
|
||||
st_init_bitmap_functions(struct dd_function_table *functions);
|
||||
|
||||
@@ -58,33 +56,5 @@ st_make_bitmap_fragment_program(struct st_context *st,
|
||||
extern void
|
||||
st_flush_bitmap_cache(struct st_context *st);
|
||||
|
||||
#else
|
||||
|
||||
static INLINE void
|
||||
st_init_bitmap_functions(struct dd_function_table *functions)
|
||||
{
|
||||
}
|
||||
|
||||
static INLINE void
|
||||
st_init_bitmap(struct st_context *st)
|
||||
{
|
||||
}
|
||||
|
||||
static INLINE void
|
||||
st_destroy_bitmap(struct st_context *st)
|
||||
{
|
||||
}
|
||||
|
||||
static INLINE void
|
||||
st_flush_bitmap_cache(struct st_context *st)
|
||||
{
|
||||
}
|
||||
|
||||
static INLINE void
|
||||
st_flush_bitmap(struct st_context *st)
|
||||
{
|
||||
}
|
||||
|
||||
#endif /* FEATURE_drawpix */
|
||||
|
||||
#endif /* ST_CB_BITMAP_H */
|
||||
|
@@ -71,8 +71,6 @@
|
||||
#include "cso_cache/cso_context.h"
|
||||
|
||||
|
||||
#if FEATURE_drawpix
|
||||
|
||||
/**
|
||||
* Check if the given program is:
|
||||
* 0: MOVE result.color, fragment.color;
|
||||
@@ -1661,5 +1659,3 @@ st_destroy_drawpix(struct st_context *st)
|
||||
if (st->drawpix.vert_shaders[1])
|
||||
cso_delete_vertex_shader(st->cso_context, st->drawpix.vert_shaders[1]);
|
||||
}
|
||||
|
||||
#endif /* FEATURE_drawpix */
|
||||
|
@@ -36,8 +36,6 @@
|
||||
struct dd_function_table;
|
||||
struct st_context;
|
||||
|
||||
#if FEATURE_drawpix
|
||||
|
||||
extern void st_init_drawpixels_functions(struct dd_function_table *functions);
|
||||
|
||||
extern void
|
||||
@@ -53,18 +51,5 @@ st_make_drawpix_z_stencil_program(struct st_context *st,
|
||||
GLboolean write_depth,
|
||||
GLboolean write_stencil);
|
||||
|
||||
#else
|
||||
|
||||
static INLINE void
|
||||
st_init_drawpixels_functions(struct dd_function_table *functions)
|
||||
{
|
||||
}
|
||||
|
||||
static INLINE void
|
||||
st_destroy_drawpix(struct st_context *st)
|
||||
{
|
||||
}
|
||||
|
||||
#endif /* FEATURE_drawpix */
|
||||
|
||||
#endif /* ST_CB_DRAWPIXELS_H */
|
||||
|
@@ -497,7 +497,6 @@ st_translate_fragment_program(struct st_context *st,
|
||||
|
||||
assert(!(key->bitmap && key->drawpixels));
|
||||
|
||||
#if FEATURE_drawpix
|
||||
if (key->bitmap) {
|
||||
/* glBitmap drawing */
|
||||
struct gl_fragment_program *fp; /* we free this temp program below */
|
||||
@@ -525,7 +524,6 @@ st_translate_fragment_program(struct st_context *st,
|
||||
}
|
||||
stfp = st_fragment_program(fp);
|
||||
}
|
||||
#endif
|
||||
|
||||
if (!stfp->glsl_to_tgsi)
|
||||
_mesa_remove_output_reads(&stfp->Base.Base, PROGRAM_OUTPUT);
|
||||
|
Reference in New Issue
Block a user