mesa: remove FEATURE_dlist define.
Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com> Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
parent
dce8602251
commit
09df07373b
|
@ -1006,7 +1006,6 @@ _mesa_initialize_context(struct gl_context *ctx,
|
||||||
|
|
||||||
switch (ctx->API) {
|
switch (ctx->API) {
|
||||||
case API_OPENGL:
|
case API_OPENGL:
|
||||||
#if FEATURE_dlist
|
|
||||||
ctx->Save = _mesa_create_save_table();
|
ctx->Save = _mesa_create_save_table();
|
||||||
if (!ctx->Save) {
|
if (!ctx->Save) {
|
||||||
_mesa_reference_shared_state(ctx, &ctx->Shared, NULL);
|
_mesa_reference_shared_state(ctx, &ctx->Shared, NULL);
|
||||||
|
@ -1015,7 +1014,6 @@ _mesa_initialize_context(struct gl_context *ctx,
|
||||||
}
|
}
|
||||||
|
|
||||||
_mesa_install_save_vtxfmt( ctx, &ctx->ListState.ListVtxfmt );
|
_mesa_install_save_vtxfmt( ctx, &ctx->ListState.ListVtxfmt );
|
||||||
#endif
|
|
||||||
case API_OPENGL_CORE:
|
case API_OPENGL_CORE:
|
||||||
break;
|
break;
|
||||||
case API_OPENGLES:
|
case API_OPENGLES:
|
||||||
|
|
|
@ -553,9 +553,6 @@ union uint64_pair
|
||||||
static GLuint InstSize[OPCODE_END_OF_LIST + 1];
|
static GLuint InstSize[OPCODE_END_OF_LIST + 1];
|
||||||
|
|
||||||
|
|
||||||
#if FEATURE_dlist
|
|
||||||
|
|
||||||
|
|
||||||
void mesa_print_display_list(GLuint list);
|
void mesa_print_display_list(GLuint list);
|
||||||
|
|
||||||
|
|
||||||
|
@ -11076,9 +11073,6 @@ void _mesa_init_dlist_dispatch(struct _glapi_table *disp)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#endif /* FEATURE_dlist */
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Initialize display list state for given context.
|
* Initialize display list state for given context.
|
||||||
*/
|
*/
|
||||||
|
@ -11106,9 +11100,7 @@ _mesa_init_display_list(struct gl_context *ctx)
|
||||||
/* Display List group */
|
/* Display List group */
|
||||||
ctx->List.ListBase = 0;
|
ctx->List.ListBase = 0;
|
||||||
|
|
||||||
#if FEATURE_dlist
|
|
||||||
_mesa_save_vtxfmt_init(&ctx->ListState.ListVtxfmt);
|
_mesa_save_vtxfmt_init(&ctx->ListState.ListVtxfmt);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -37,8 +37,6 @@
|
||||||
#include "main/mtypes.h"
|
#include "main/mtypes.h"
|
||||||
|
|
||||||
|
|
||||||
#if FEATURE_dlist
|
|
||||||
|
|
||||||
#define _MESA_INIT_DLIST_VTXFMT(vfmt, impl) \
|
#define _MESA_INIT_DLIST_VTXFMT(vfmt, impl) \
|
||||||
do { \
|
do { \
|
||||||
(vfmt)->CallList = impl ## CallList; \
|
(vfmt)->CallList = impl ## CallList; \
|
||||||
|
@ -70,32 +68,6 @@ extern void _mesa_install_dlist_vtxfmt(struct _glapi_table *disp,
|
||||||
|
|
||||||
extern void _mesa_init_dlist_dispatch(struct _glapi_table *disp);
|
extern void _mesa_init_dlist_dispatch(struct _glapi_table *disp);
|
||||||
|
|
||||||
#else /* FEATURE_dlist */
|
|
||||||
|
|
||||||
#include "main/compiler.h"
|
|
||||||
|
|
||||||
#define _MESA_INIT_DLIST_VTXFMT(vfmt, impl) do { } while (0)
|
|
||||||
|
|
||||||
static inline void
|
|
||||||
_mesa_delete_list(struct gl_context *ctx, struct gl_display_list *dlist)
|
|
||||||
{
|
|
||||||
/* there should be no list to delete */
|
|
||||||
ASSERT_NO_FEATURE();
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void
|
|
||||||
_mesa_install_dlist_vtxfmt(struct _glapi_table *disp,
|
|
||||||
const GLvertexformat *vfmt)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void
|
|
||||||
_mesa_init_dlist_dispatch(struct _glapi_table *disp)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif /* FEATURE_dlist */
|
|
||||||
|
|
||||||
extern void _mesa_init_display_list( struct gl_context * ctx );
|
extern void _mesa_init_display_list( struct gl_context * ctx );
|
||||||
|
|
||||||
extern void _mesa_free_display_list_data(struct gl_context *ctx);
|
extern void _mesa_free_display_list_data(struct gl_context *ctx);
|
||||||
|
|
|
@ -84,7 +84,6 @@
|
||||||
#define FEATURE_remap_table 0
|
#define FEATURE_remap_table 0
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define FEATURE_dlist FEATURE_GL
|
|
||||||
#define FEATURE_draw_read_buffer FEATURE_GL
|
#define FEATURE_draw_read_buffer FEATURE_GL
|
||||||
#define FEATURE_drawpix FEATURE_GL
|
#define FEATURE_drawpix FEATURE_GL
|
||||||
#define FEATURE_evaluators FEATURE_GL
|
#define FEATURE_evaluators FEATURE_GL
|
||||||
|
|
|
@ -78,9 +78,7 @@ struct vbo_context {
|
||||||
GLuint map_vp_arb[VERT_ATTRIB_MAX];
|
GLuint map_vp_arb[VERT_ATTRIB_MAX];
|
||||||
|
|
||||||
struct vbo_exec_context exec;
|
struct vbo_exec_context exec;
|
||||||
#if FEATURE_dlist
|
|
||||||
struct vbo_save_context save;
|
struct vbo_save_context save;
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Callback into the driver. This must always succeed, the driver
|
/* Callback into the driver. This must always succeed, the driver
|
||||||
* is responsible for initiating any fallback actions required:
|
* is responsible for initiating any fallback actions required:
|
||||||
|
|
|
@ -34,9 +34,6 @@
|
||||||
#include "vbo_context.h"
|
#include "vbo_context.h"
|
||||||
|
|
||||||
|
|
||||||
#if FEATURE_dlist
|
|
||||||
|
|
||||||
|
|
||||||
static void vbo_save_callback_init( struct gl_context *ctx )
|
static void vbo_save_callback_init( struct gl_context *ctx )
|
||||||
{
|
{
|
||||||
ctx->Driver.NewList = vbo_save_NewList;
|
ctx->Driver.NewList = vbo_save_NewList;
|
||||||
|
@ -131,6 +128,3 @@ void vbo_save_fallback( struct gl_context *ctx, GLboolean fallback )
|
||||||
else
|
else
|
||||||
save->replay_flags &= ~VBO_SAVE_FALLBACK;
|
save->replay_flags &= ~VBO_SAVE_FALLBACK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#endif /* FEATURE_dlist */
|
|
||||||
|
|
|
@ -158,8 +158,6 @@ struct vbo_save_context {
|
||||||
GLubyte *currentsz[VBO_ATTRIB_MAX];
|
GLubyte *currentsz[VBO_ATTRIB_MAX];
|
||||||
};
|
};
|
||||||
|
|
||||||
#if FEATURE_dlist
|
|
||||||
|
|
||||||
void vbo_save_init( struct gl_context *ctx );
|
void vbo_save_init( struct gl_context *ctx );
|
||||||
void vbo_save_destroy( struct gl_context *ctx );
|
void vbo_save_destroy( struct gl_context *ctx );
|
||||||
void vbo_save_fallback( struct gl_context *ctx, GLboolean fallback );
|
void vbo_save_fallback( struct gl_context *ctx, GLboolean fallback );
|
||||||
|
@ -195,18 +193,4 @@ void
|
||||||
vbo_save_unmap_vertex_store(struct gl_context *ctx,
|
vbo_save_unmap_vertex_store(struct gl_context *ctx,
|
||||||
struct vbo_save_vertex_store *vertex_store);
|
struct vbo_save_vertex_store *vertex_store);
|
||||||
|
|
||||||
#else /* FEATURE_dlist */
|
|
||||||
|
|
||||||
static inline void
|
|
||||||
vbo_save_init( struct gl_context *ctx )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void
|
|
||||||
vbo_save_destroy( struct gl_context *ctx )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif /* FEATURE_dlist */
|
|
||||||
|
|
||||||
#endif /* VBO_SAVE_H */
|
#endif /* VBO_SAVE_H */
|
||||||
|
|
|
@ -84,9 +84,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
#include "vbo_noop.h"
|
#include "vbo_noop.h"
|
||||||
|
|
||||||
|
|
||||||
#if FEATURE_dlist
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef ERROR
|
#ifdef ERROR
|
||||||
#undef ERROR
|
#undef ERROR
|
||||||
#endif
|
#endif
|
||||||
|
@ -1668,6 +1665,3 @@ vbo_save_api_init(struct vbo_save_context *save)
|
||||||
ctx->ListState.ListVtxfmt.MultiDrawElementsBaseVertex = _save_OBE_MultiDrawElementsBaseVertex;
|
ctx->ListState.ListVtxfmt.MultiDrawElementsBaseVertex = _save_OBE_MultiDrawElementsBaseVertex;
|
||||||
_mesa_install_save_vtxfmt(ctx, &ctx->ListState.ListVtxfmt);
|
_mesa_install_save_vtxfmt(ctx, &ctx->ListState.ListVtxfmt);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#endif /* FEATURE_dlist */
|
|
||||||
|
|
|
@ -39,9 +39,6 @@
|
||||||
#include "vbo_context.h"
|
#include "vbo_context.h"
|
||||||
|
|
||||||
|
|
||||||
#if FEATURE_dlist
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* After playback, copy everything but the position from the
|
* After playback, copy everything but the position from the
|
||||||
* last vertex to the saved state
|
* last vertex to the saved state
|
||||||
|
@ -331,6 +328,3 @@ end:
|
||||||
save->buffer_ptr = vbo_save_map_vertex_store(ctx, save->vertex_store);
|
save->buffer_ptr = vbo_save_map_vertex_store(ctx, save->vertex_store);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#endif /* FEATURE_dlist */
|
|
||||||
|
|
|
@ -37,9 +37,6 @@
|
||||||
#include "vbo_context.h"
|
#include "vbo_context.h"
|
||||||
|
|
||||||
|
|
||||||
#if FEATURE_dlist
|
|
||||||
|
|
||||||
|
|
||||||
typedef void (*attr_func)( struct gl_context *ctx, GLint target, const GLfloat * );
|
typedef void (*attr_func)( struct gl_context *ctx, GLint target, const GLfloat * );
|
||||||
|
|
||||||
|
|
||||||
|
@ -191,6 +188,3 @@ void vbo_loopback_vertex_list( struct gl_context *ctx,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#endif /* FEATURE_dlist */
|
|
||||||
|
|
Loading…
Reference in New Issue