OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: remove FEATURE_feedback define.

Browse Source 
Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Oliver McFadden
2012-09-11 09:16:33 +03:00
parent fa9fc2332b
commit 26a26e9992
9 changed files with 0 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mesa/drivers/common/meta.c
View File

@@ -179,12 +179,10 @@ struct save_state
struct gl_query_object *CondRenderQuery; struct gl_query_object *CondRenderQuery;
GLenum CondRenderMode; GLenum CondRenderMode;
#if FEATURE_feedback
/** MESA_META_SELECT_FEEDBACK */ /** MESA_META_SELECT_FEEDBACK */
GLenum RenderMode; GLenum RenderMode;
struct gl_selection Select; struct gl_selection Select;
struct gl_feedback Feedback; struct gl_feedback Feedback;
#endif
/** MESA_META_MULTISAMPLE */ /** MESA_META_MULTISAMPLE */
GLboolean MultisampleEnabled; GLboolean MultisampleEnabled;
@@ -751,7 +749,6 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state)
_mesa_EndConditionalRender(); _mesa_EndConditionalRender();
} }
#if FEATURE_feedback
if (state & MESA_META_SELECT_FEEDBACK) { if (state & MESA_META_SELECT_FEEDBACK) {
save->RenderMode = ctx->RenderMode; save->RenderMode = ctx->RenderMode;
if (ctx->RenderMode == GL_SELECT) { if (ctx->RenderMode == GL_SELECT) {
@@ -762,7 +759,6 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state)
_mesa_RenderMode(GL_RENDER); _mesa_RenderMode(GL_RENDER);
} }
} }
#endif
if (state & MESA_META_MULTISAMPLE) { if (state & MESA_META_MULTISAMPLE) {
save->MultisampleEnabled = ctx->Multisample.Enabled; save->MultisampleEnabled = ctx->Multisample.Enabled;
@@ -1057,7 +1053,6 @@ _mesa_meta_end(struct gl_context *ctx)
save->CondRenderMode); save->CondRenderMode);
} }
#if FEATURE_feedback
if (state & MESA_META_SELECT_FEEDBACK) { if (state & MESA_META_SELECT_FEEDBACK) {
if (save->RenderMode == GL_SELECT) { if (save->RenderMode == GL_SELECT) {
_mesa_RenderMode(GL_SELECT); _mesa_RenderMode(GL_SELECT);
@@ -1067,7 +1062,6 @@ _mesa_meta_end(struct gl_context *ctx)
ctx->Feedback = save->Feedback; ctx->Feedback = save->Feedback;
} }
} }
#endif
if (state & MESA_META_MULTISAMPLE) { if (state & MESA_META_MULTISAMPLE) {
if (ctx->Multisample.Enabled != save->MultisampleEnabled) if (ctx->Multisample.Enabled != save->MultisampleEnabled)

6
src/mesa/main/feedback.c
View File

@@ -40,9 +40,6 @@
#include "main/dispatch.h" #include "main/dispatch.h"
#if FEATURE_feedback
#define FB_3D 0x01 #define FB_3D 0x01
#define FB_4D 0x02 #define FB_4D 0x02
#define FB_COLOR 0x04 #define FB_COLOR 0x04
@@ -515,9 +512,6 @@ _mesa_init_feedback_dispatch(struct _glapi_table *disp)
} }
#endif /* FEATURE_feedback */
/**********************************************************************/ /**********************************************************************/
/** \name Initialization */ /** \name Initialization */
/*@{*/ /*@{*/

37
src/mesa/main/feedback.h
View File

@@ -31,8 +31,6 @@
#include "main/mtypes.h" #include "main/mtypes.h"
#if FEATURE_feedback
extern GLint GLAPIENTRY extern GLint GLAPIENTRY
_mesa_RenderMode( GLenum mode ); _mesa_RenderMode( GLenum mode );
@@ -60,41 +58,6 @@ _mesa_update_hitflag( struct gl_context *ctx, GLfloat z );
extern void extern void
_mesa_init_feedback_dispatch(struct _glapi_table *disp); _mesa_init_feedback_dispatch(struct _glapi_table *disp);
#else /* FEATURE_feedback */
#include "main/compiler.h"
static inline void
_mesa_feedback_vertex( struct gl_context *ctx,
const GLfloat win[4],
const GLfloat color[4],
const GLfloat texcoord[4] )
{
/* render mode is always GL_RENDER */
ASSERT_NO_FEATURE();
}
static inline void
_mesa_feedback_token( struct gl_context *ctx, GLfloat token )
{
/* render mode is always GL_RENDER */
ASSERT_NO_FEATURE();
}
static inline void
_mesa_update_hitflag( struct gl_context *ctx, GLfloat z )
{
/* render mode is always GL_RENDER */
ASSERT_NO_FEATURE();
}
static inline void
_mesa_init_feedback_dispatch(struct _glapi_table *disp)
{
}
#endif /* FEATURE_feedback */
extern void extern void
_mesa_init_feedback( struct gl_context *ctx ); _mesa_init_feedback( struct gl_context *ctx );

1
src/mesa/main/mfeatures.h
View File

@@ -84,7 +84,6 @@
#define FEATURE_remap_table 0 #define FEATURE_remap_table 0
#endif #endif
#define FEATURE_feedback FEATURE_GL
#define FEATURE_pixel_transfer FEATURE_GL #define FEATURE_pixel_transfer FEATURE_GL
#define FEATURE_queryobj FEATURE_GL #define FEATURE_queryobj FEATURE_GL
#define FEATURE_rastpos FEATURE_GL #define FEATURE_rastpos FEATURE_GL

4
src/mesa/state_tracker/st_cb_feedback.c
View File

@@ -55,8 +55,6 @@
#include "draw/draw_pipe.h" #include "draw/draw_pipe.h"
#if FEATURE_feedback
/** /**
* This is actually used for both feedback and selection. * This is actually used for both feedback and selection.
*/ */
@@ -305,5 +303,3 @@ void st_init_feedback_functions(struct dd_function_table *functions)
{ {
functions->RenderMode = st_RenderMode; functions->RenderMode = st_RenderMode;
} }
#endif /* FEATURE_feedback */

10
src/mesa/state_tracker/st_cb_feedback.h
View File

@@ -35,18 +35,8 @@
struct dd_function_table; struct dd_function_table;
#if FEATURE_feedback
extern void extern void
st_init_feedback_functions(struct dd_function_table *functions); st_init_feedback_functions(struct dd_function_table *functions);
#else
static INLINE void
st_init_feedback_functions(struct dd_function_table *functions)
{
}
#endif /* FEATURE_feedback */
#endif /* ST_CB_FEEDBACK_H */ #endif /* ST_CB_FEEDBACK_H */

4
src/mesa/state_tracker/st_draw.c
View File

@@ -278,7 +278,6 @@ st_init_draw(struct st_context *st)
vbo_set_draw_func(ctx, st_draw_vbo); vbo_set_draw_func(ctx, st_draw_vbo);
#if FEATURE_feedback || FEATURE_rastpos
st->draw = draw_create(st->pipe); /* for selection/feedback */ st->draw = draw_create(st->pipe); /* for selection/feedback */
/* Disable draw options that might convert points/lines to tris, etc. /* Disable draw options that might convert points/lines to tris, etc.
@@ -288,14 +287,11 @@ st_init_draw(struct st_context *st)
draw_wide_point_threshold(st->draw, 1000.0f); draw_wide_point_threshold(st->draw, 1000.0f);
draw_enable_line_stipple(st->draw, FALSE); draw_enable_line_stipple(st->draw, FALSE);
draw_enable_point_sprites(st->draw, FALSE); draw_enable_point_sprites(st->draw, FALSE);
#endif
} }
void void
st_destroy_draw(struct st_context *st) st_destroy_draw(struct st_context *st)
{ {
#if FEATURE_feedback || FEATURE_rastpos
draw_destroy(st->draw); draw_destroy(st->draw);
#endif
} }

5
src/mesa/state_tracker/st_draw_feedback.c
View File

@@ -46,8 +46,6 @@
#include "draw/draw_context.h" #include "draw/draw_context.h"
#if FEATURE_feedback || FEATURE_rastpos
/** /**
* Set the (private) draw module's post-transformed vertex format when in * Set the (private) draw module's post-transformed vertex format when in
* GL_SELECT or GL_FEEDBACK mode or for glRasterPos. * GL_SELECT or GL_FEEDBACK mode or for glRasterPos.
@@ -268,6 +266,3 @@ st_feedback_draw_vbo(struct gl_context *ctx,
} }
draw_set_vertex_buffers(draw, 0, NULL); draw_set_vertex_buffers(draw, 0, NULL);
} }
#endif /* FEATURE_feedback || FEATURE_rastpos */

2
src/mesa/state_tracker/st_program.c
View File

@@ -66,10 +66,8 @@ delete_vp_variant(struct st_context *st, struct st_vp_variant *vpv)
if (vpv->driver_shader) if (vpv->driver_shader)
cso_delete_vertex_shader(st->cso_context, vpv->driver_shader); cso_delete_vertex_shader(st->cso_context, vpv->driver_shader);
#if FEATURE_feedback || FEATURE_rastpos
if (vpv->draw_shader) if (vpv->draw_shader)
draw_delete_vertex_shader( st->draw, vpv->draw_shader ); draw_delete_vertex_shader( st->draw, vpv->draw_shader );
#endif
if (vpv->tgsi.tokens) if (vpv->tgsi.tokens)
st_free_tokens(vpv->tgsi.tokens); st_free_tokens(vpv->tgsi.tokens);