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

mesa: remove FEATURE_drawpix 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:14:31 +03:00
parent 53514b0326
commit 24c3d16f3b
8 changed files with 0 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,9 +39,6 @@
#include "fbobject.h" #include "fbobject.h"
#if FEATURE_drawpix
/* /*
* Execute glDrawPixels * Execute glDrawPixels
*/ */
@@ -379,6 +376,3 @@ _mesa_init_drawpix_dispatch(struct _glapi_table *disp)
SET_CopyPixels(disp, _mesa_CopyPixels); SET_CopyPixels(disp, _mesa_CopyPixels);
SET_DrawPixels(disp, _mesa_DrawPixels); SET_DrawPixels(disp, _mesa_DrawPixels);
} }
#endif /* FEATURE_drawpix */

11
src/mesa/main/drawpix.h
View File

@@ -32,19 +32,8 @@
struct _glapi_table; struct _glapi_table;
#if FEATURE_drawpix
extern void extern void
_mesa_init_drawpix_dispatch(struct _glapi_table *disp); _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 */ #endif /* DRAWPIX_H */

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_drawpix FEATURE_GL
#define FEATURE_evaluators FEATURE_GL #define FEATURE_evaluators FEATURE_GL
#define FEATURE_feedback FEATURE_GL #define FEATURE_feedback FEATURE_GL
#define FEATURE_pixel_transfer FEATURE_GL #define FEATURE_pixel_transfer FEATURE_GL

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

@@ -57,8 +57,6 @@
#include "cso_cache/cso_context.h" #include "cso_cache/cso_context.h"
#if FEATURE_drawpix
/** /**
* glBitmaps are drawn as textured quads. The user's bitmap pattern * glBitmaps are drawn as textured quads. The user's bitmap pattern
* is stored in a texture image. An alpha8 texture format is used. * 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; st->bitmap.cache = NULL;
} }
} }
#endif /* FEATURE_drawpix */

30
src/mesa/state_tracker/st_cb_bitmap.h
View File

@@ -38,8 +38,6 @@ struct st_context;
struct gl_fragment_program; struct gl_fragment_program;
struct st_fragment_program; struct st_fragment_program;
#if FEATURE_drawpix
extern void extern void
st_init_bitmap_functions(struct dd_function_table *functions); st_init_bitmap_functions(struct dd_function_table *functions);
@@ -58,33 +56,5 @@ st_make_bitmap_fragment_program(struct st_context *st,
extern void extern void
st_flush_bitmap_cache(struct st_context *st); 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 */ #endif /* ST_CB_BITMAP_H */

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

@@ -71,8 +71,6 @@
#include "cso_cache/cso_context.h" #include "cso_cache/cso_context.h"
#if FEATURE_drawpix
/** /**
* Check if the given program is: * Check if the given program is:
* 0: MOVE result.color, fragment.color; * 0: MOVE result.color, fragment.color;
@@ -1661,5 +1659,3 @@ st_destroy_drawpix(struct st_context *st)
if (st->drawpix.vert_shaders[1]) if (st->drawpix.vert_shaders[1])
cso_delete_vertex_shader(st->cso_context, st->drawpix.vert_shaders[1]); cso_delete_vertex_shader(st->cso_context, st->drawpix.vert_shaders[1]);
} }
#endif /* FEATURE_drawpix */

15
src/mesa/state_tracker/st_cb_drawpixels.h
View File

@@ -36,8 +36,6 @@
struct dd_function_table; struct dd_function_table;
struct st_context; struct st_context;
#if FEATURE_drawpix
extern void st_init_drawpixels_functions(struct dd_function_table *functions); extern void st_init_drawpixels_functions(struct dd_function_table *functions);
extern void extern void
@@ -53,18 +51,5 @@ st_make_drawpix_z_stencil_program(struct st_context *st,
GLboolean write_depth, GLboolean write_depth,
GLboolean write_stencil); 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 */ #endif /* ST_CB_DRAWPIXELS_H */

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

@@ -497,7 +497,6 @@ st_translate_fragment_program(struct st_context *st,
assert(!(key->bitmap && key->drawpixels)); assert(!(key->bitmap && key->drawpixels));
#if FEATURE_drawpix
if (key->bitmap) { if (key->bitmap) {
/* glBitmap drawing */ /* glBitmap drawing */
struct gl_fragment_program *fp; /* we free this temp program below */ 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); stfp = st_fragment_program(fp);
} }
#endif
if (!stfp->glsl_to_tgsi) if (!stfp->glsl_to_tgsi)
_mesa_remove_output_reads(&stfp->Base.Base, PROGRAM_OUTPUT); _mesa_remove_output_reads(&stfp->Base.Base, PROGRAM_OUTPUT);