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

mesa: remove FEATURE_texture_fxt1 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:38:11 +03:00
parent d4c2b1e8f8
commit beb293e4cd
7 changed files with 0 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mesa/main/extensions.c
View File

@@ -522,9 +522,7 @@ _mesa_enable_sw_extensions(struct gl_context *ctx)
#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program #if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
ctx->Extensions.EXT_gpu_program_parameters = GL_TRUE; ctx->Extensions.EXT_gpu_program_parameters = GL_TRUE;
#endif #endif
#if FEATURE_texture_fxt1
_mesa_enable_extension(ctx, "GL_3DFX_texture_compression_FXT1"); _mesa_enable_extension(ctx, "GL_3DFX_texture_compression_FXT1");
#endif
#if FEATURE_texture_s3tc #if FEATURE_texture_s3tc
if (ctx->Mesa_DXTn) { if (ctx->Mesa_DXTn) {
_mesa_enable_extension(ctx, "GL_EXT_texture_compression_s3tc"); _mesa_enable_extension(ctx, "GL_EXT_texture_compression_s3tc");

2
src/mesa/main/formats.c
View File

@@ -2265,10 +2265,8 @@ _mesa_format_to_type_and_comps(gl_format format,
return; return;
#endif #endif
#if FEATURE_texture_fxt1
case MESA_FORMAT_RGB_FXT1: case MESA_FORMAT_RGB_FXT1:
case MESA_FORMAT_RGBA_FXT1: case MESA_FORMAT_RGBA_FXT1:
#endif
#if FEATURE_texture_s3tc #if FEATURE_texture_s3tc
case MESA_FORMAT_RGB_DXT1: case MESA_FORMAT_RGB_DXT1:
case MESA_FORMAT_RGBA_DXT1: case MESA_FORMAT_RGBA_DXT1:

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_texture_fxt1 FEATURE_GL
#define FEATURE_texture_s3tc FEATURE_GL #define FEATURE_texture_s3tc FEATURE_GL
#define FEATURE_extra_context_init FEATURE_ES #define FEATURE_extra_context_init FEATURE_ES

2
src/mesa/main/texcompress.c
View File

@@ -375,12 +375,10 @@ GLenum
_mesa_compressed_format_to_glenum(struct gl_context *ctx, gl_format mesaFormat) _mesa_compressed_format_to_glenum(struct gl_context *ctx, gl_format mesaFormat)
{ {
switch (mesaFormat) { switch (mesaFormat) {
#if FEATURE_texture_fxt1
case MESA_FORMAT_RGB_FXT1: case MESA_FORMAT_RGB_FXT1:
return GL_COMPRESSED_RGB_FXT1_3DFX; return GL_COMPRESSED_RGB_FXT1_3DFX;
case MESA_FORMAT_RGBA_FXT1: case MESA_FORMAT_RGBA_FXT1:
return GL_COMPRESSED_RGBA_FXT1_3DFX; return GL_COMPRESSED_RGBA_FXT1_3DFX;
#endif
#if FEATURE_texture_s3tc #if FEATURE_texture_s3tc
case MESA_FORMAT_RGB_DXT1: case MESA_FORMAT_RGB_DXT1:
return GL_COMPRESSED_RGB_S3TC_DXT1_EXT; return GL_COMPRESSED_RGB_S3TC_DXT1_EXT;

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

@@ -42,9 +42,6 @@
#include "swrast/s_context.h" #include "swrast/s_context.h"
#if FEATURE_texture_fxt1
static void static void
fxt1_encode (GLuint width, GLuint height, GLint comps, fxt1_encode (GLuint width, GLuint height, GLint comps,
const void *source, GLint srcRowStride, const void *source, GLint srcRowStride,
@@ -1646,6 +1643,3 @@ fxt1_decode_1 (const void *texture, GLint stride, /* in pixels */
decode_1[mode](code, t, rgba); decode_1[mode](code, t, rgba);
} }
#endif /* FEATURE_texture_fxt1 */

14
src/mesa/main/texcompress_fxt1.h
View File

@@ -31,8 +31,6 @@
struct swrast_texture_image; struct swrast_texture_image;
#if FEATURE_texture_fxt1
extern GLboolean extern GLboolean
_mesa_texstore_rgb_fxt1(TEXSTORE_PARAMS); _mesa_texstore_rgb_fxt1(TEXSTORE_PARAMS);
@@ -47,16 +45,4 @@ extern void
_mesa_fetch_texel_2d_f_rgb_fxt1(const struct swrast_texture_image *texImage, _mesa_fetch_texel_2d_f_rgb_fxt1(const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel); GLint i, GLint j, GLint k, GLfloat *texel);
#else /* FEATURE_texture_fxt1 */
/* these are used only in texstore_funcs[] */
#define _mesa_texstore_rgb_fxt1 NULL
#define _mesa_texstore_rgba_fxt1 NULL
/* these are used only in texfetch_funcs[] */
#define _mesa_fetch_texel_2d_f_rgba_fxt1 NULL
#define _mesa_fetch_texel_2d_f_rgb_fxt1 NULL
#endif /* FEATURE_texture_fxt1 */
#endif /* TEXCOMPRESS_FXT1_H */ #endif /* TEXCOMPRESS_FXT1_H */

2
src/mesa/main/texformat.c
View File

@@ -289,7 +289,6 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
} }
} }
#if FEATURE_texture_fxt1
if (ctx->Extensions.TDFX_texture_compression_FXT1) { if (ctx->Extensions.TDFX_texture_compression_FXT1) {
switch (internalFormat) { switch (internalFormat) {
case GL_COMPRESSED_RGB_FXT1_3DFX: case GL_COMPRESSED_RGB_FXT1_3DFX:
@@ -302,7 +301,6 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
; /* fallthrough */ ; /* fallthrough */
} }
} }
#endif
#if FEATURE_texture_s3tc #if FEATURE_texture_s3tc
if (ctx->Extensions.EXT_texture_compression_s3tc) { if (ctx->Extensions.EXT_texture_compression_s3tc) {